2.2fixes

Model/Behavior/BitmaskedBehavior.php

@@ -134,7 +134,7 @@ class BitmaskedBehavior extends ModelBehavior {
 		if (empty($value)) {
 			return null;
 		}
-		foreach ((array) $value as $key => $val) {
+		foreach ((array)$value as $key => $val) {
 			$res |= (int) $val;
 		}
 		if ($res === 0) {
@@ -190,7 +190,7 @@ class BitmaskedBehavior extends ModelBehavior {
 	 * @return array $sqlSnippet
 	 */
 	public function isBit(Model $Model, $bits) {
-		$bits = (array) $bits;
+		$bits = (array)$bits;
 		$bitmask = $this->encodeBitmask($Model, $bits);
 		
 		$field = $this->settings[$Model->alias]['field'];
@@ -202,7 +202,7 @@ class BitmaskedBehavior extends ModelBehavior {
 	 * @return array $sqlSnippet
 	 */
 	public function isNotBit(Model $Model, $bits) {
-		$bits = (array) $bits;
+		$bits = (array)$bits;
 		$bitmask = $this->encodeBitmask($Model, $bits);
 		
 		$field = $this->settings[$Model->alias]['field'];
@@ -214,7 +214,7 @@ class BitmaskedBehavior extends ModelBehavior {
 	 * @return array $sqlSnippet
 	 */
 	public function containsBit(Model $Model, $bits) {
-		$bits = (array) $bits;
+		$bits = (array)$bits;
 		$bitmask = $this->encodeBitmask($Model, $bits);
 		
 		$field = $this->settings[$Model->alias]['field'];
@@ -226,7 +226,7 @@ class BitmaskedBehavior extends ModelBehavior {
 	 * @return array $sqlSnippet
 	 */
 	public function containsNotBit(Model $Model, $bits) {
-		$bits = (array) $bits;
+		$bits = (array)$bits;
 		$bitmask = $this->encodeBitmask($Model, $bits);
 		
 		$field = $this->settings[$Model->alias]['field'];

Model/Behavior/CaptchaBehavior.php

@@ -33,7 +33,7 @@ class CaptchaBehavior extends ModelBehavior {
 		
 		# bootstrap configs
 		$this->settings[$Model->alias] = $defaults;
-		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], (array) Configure::read('Captcha'));
+		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], (array)Configure::read('Captcha'));
 		if (!empty($settings)) {
 			$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], $settings);
 		}

Model/Behavior/DecimalInputBehavior.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * A behavior to automatically format decimals from DB to output and reverse
+ * //ALREADY exists as number_format in a slightly different way!
  *
  * 20,01 => 20.01 (!)
  * 11.222 => 11222
@@ -38,7 +38,8 @@ class DecimalInputBehavior extends ModelBehavior {
 
 
 	/**
-	* adjust configs like: $Model->Behaviors-attach('DecimalInput', array('fields'=>array('xyz')))
+	* adjust configs like: $Model->Behaviors-attach('Tools.DecimalInput', array('fields'=>array('xyz')))
+	* leave fields empty to auto-detect all float inputs
 	*/
 	public function setup(Model $Model, $config = array()) {
 		$this->config[$Model->alias] = $this->default;

Model/Behavior/LogableBehavior.php

@@ -1,4 +1,9 @@
 <?php
+App::uses('CakeSession', 'Model/Datasource');
+
+if (!defined('CLASS_USER')) {
+	define('CLASS_USER', 'User');
+}
 
 /**
  * Logs saves and deletes of any model
@@ -60,18 +65,13 @@
  * 
  * 2011-11-17 ms
  */
-
-if (!defined('CLASS_USER')) {
-	define('CLASS_USER', 'User');
-}
-
 class LogableBehavior extends ModelBehavior {
 	
 	public $user = null; # user data array
 	
 	public $UserModel = null;
 	
-	public $defaults = array(
+	protected $_defaults = array(
 		'enabled' => true,
 		'userModel' => CLASS_USER,
 		'userKey' => 'user_id',
@@ -100,7 +100,7 @@ class LogableBehavior extends ModelBehavior {
 		if (!is_array($config)) {
 			$config = array();
 		}
-		$this->settings[$Model->alias] = array_merge($this->defaults, $config);
+		$this->settings[$Model->alias] = array_merge($this->_defaults, $config);
 		$this->settings[$Model->alias]['ignore'][] = $Model->primaryKey;
 
 		$this->Log = ClassRegistry::init('Tools.Log');

Model/Behavior/SluggedBehavior.php

@@ -22,11 +22,7 @@
 /**
  * Ensure that mb_ functions exist
  */
-
-if (!class_exists('Multibyte')) {
-	//App::import('Core', 'Multibyte');
-	App::uses('Multibyte', 'I18n');
-}
+App::uses('Multibyte', 'I18n');
 
 /**
  * SluggedBehavior class
@@ -111,7 +107,7 @@ class SluggedBehavior extends ModelBehavior {
 		$this->_defaultSettings['notices'] = Configure::read('debug');
 		$this->_defaultSettings['label'] = array($Model->displayField);
 		$this->settings[$Model->alias] = Set::merge($this->_defaultSettings, $config);
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		$label = $this->settings[$Model->alias]['label'] = (array)$label;
 		if ($Model->Behaviors->attached('Translate')) {
 			$notices = false;
@@ -142,7 +138,7 @@ class SluggedBehavior extends ModelBehavior {
  * @access public
  */
 	public function beforeValidate(Model $Model) {
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		if ($run !== 'beforeValidate') {
 			return true;
 		}
@@ -157,7 +153,7 @@ class SluggedBehavior extends ModelBehavior {
  * @access public
  */
 	public function beforeSave(Model $Model) {
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		if ($run !== 'beforeSave') {
 			return true;
 		}
@@ -179,7 +175,7 @@ class SluggedBehavior extends ModelBehavior {
  * @return void
  */
 	public function generateSlug(Model $Model) {
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		if ($notices && !$Model->hasField($slugField)) {
 			return true;
 		}
@@ -223,7 +219,7 @@ class SluggedBehavior extends ModelBehavior {
 			}
 			if ($unique) {
 				$conditions = array($Model->alias . '.' . $slugField => $slug);
-				if ($Model->id) 					{
+				if ($Model->id) {
 					$conditions['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
 				}
 				$i = 0;
@@ -274,7 +270,7 @@ class SluggedBehavior extends ModelBehavior {
 		$splitOnStopWord = true;
 		$return = 'array';
 		$originalIfEmpty = true;
-		extract ($params);
+		extract($params);
 
 		if (!class_exists('MiCache')) {
 			App::import('Vendor', 'Mi.MiCache');
@@ -367,7 +363,7 @@ class SluggedBehavior extends ModelBehavior {
  * @access public
  */
 	public function slug(Model $Model, $string, $tidy = true) {
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		$this->_setEncoding($Model, $encoding, $string, !Configure::read('debug'));
 
 		if ($replace) {
@@ -458,7 +454,7 @@ class SluggedBehavior extends ModelBehavior {
  */
 	public function resetSlugs(Model $Model, $params = array()) {
 		$recursive = -1;
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		if ($notices && !$Model->hasField($slugField)) {
 			return false;
 		}
@@ -497,7 +493,7 @@ class SluggedBehavior extends ModelBehavior {
  * @access protected
  */
 	protected function _multiSlug(Model $Model) {
-		extract ($this->settings[$Model->alias]);
+		extract($this->settings[$Model->alias]);
 		$data = $Model->data;
 		$field = current($label);
 		foreach ($Model->data[$Model->alias][$field] as $locale => $_) {

Model/Behavior/WhoDidItBehavior.php

@@ -1,4 +1,5 @@
 <?php
+App::uses('CakeSession', 'Model/Datasource');
 
 /**
  * WhoDidIt Model Behavior for CakePHP
@@ -94,11 +95,7 @@ class WhoDidItBehavior extends ModelBehavior {
 			$AuthSession = $this->settings[$Model->alias]['auth_session'];
 			$UserSession = $this->settings[$Model->alias]['user_model'];
 
-			if (isset($this->Session)) {
-				$userId = $this->Session->read($AuthSession. '.' . $UserSession. '.id');
-			} else {
-				$userId = Set::extract($_SESSION, $AuthSession . '.' . $UserSession . '.' . 'id');
-			}
+			$userId = CakeSession::read($AuthSession. '.' . $UserSession. '.id');
 
 			if ($userId) {
 				$data = array($this->settings[$Model->alias]['modified_by_field'] => $userId);