From 56afb728255b88ddbe71a5ffb88b33b59e9f506a Mon Sep 17 00:00:00 2001
From: AD7six <andydawson76@yahoo.co.uk>
Date: Wed, 14 Jan 2009 23:21:53 +0000
Subject: [PATCH] changing $model for $Model to follow conventions ($Model is
 an object)

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7994 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/model/behaviors/tree.php | 550 ++++++++++++++---------------
 1 file changed, 275 insertions(+), 275 deletions(-)

diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index de7ac5a3365..23195832e9b 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -52,24 +52,24 @@ class TreeBehavior extends ModelBehavior {
 /**
  * Initiate Tree behavior
  *
- * @param object $model
+ * @param object $Model
  * @param array $config
  * @return void
  * @access public
  */
-	function setup(&$model, $config = array()) {
+	function setup(&$Model, $config = array()) {
 		if (!is_array($config)) {
 			$config = array('type' => $config);
 		}
 		$settings = array_merge($this->_defaults, $config);
 
-		if (in_array($settings['scope'], $model->getAssociated('belongsTo'))) {
-			$data = $model->getAssociated($settings['scope']);
-			$parent =& $model->{$settings['scope']};
-			$settings['scope'] = $model->alias . '.' . $data['foreignKey'] . ' = ' . $parent->alias . '.' . $parent->primaryKey;
+		if (in_array($settings['scope'], $Model->getAssociated('belongsTo'))) {
+			$data = $Model->getAssociated($settings['scope']);
+			$parent =& $Model->{$settings['scope']};
+			$settings['scope'] = $Model->alias . '.' . $data['foreignKey'] . ' = ' . $parent->alias . '.' . $parent->primaryKey;
 			$settings['recursive'] = 0;
 		}
-		$this->settings[$model->alias] = $settings;
+		$this->settings[$Model->alias] = $settings;
 	}
 /**
  * After save method. Called after all saves
@@ -77,20 +77,20 @@ function setup(&$model, $config = array()) {
  * Overriden to transparently manage setting the lft and rght fields if and only if the parent field is included in the
  * parameters to be saved.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param boolean $created indicates whether the node just saved was created or updated
  * @return boolean true on success, false on failure
  * @access public
  */
-	function afterSave(&$model, $created) {
-		extract($this->settings[$model->alias]);
+	function afterSave(&$Model, $created) {
+		extract($this->settings[$Model->alias]);
 		if ($created) {
-			if ((isset($model->data[$model->alias][$parent])) && $model->data[$model->alias][$parent]) {
-				return $this->_setParent($model, $model->data[$model->alias][$parent], $created);
+			if ((isset($Model->data[$Model->alias][$parent])) && $Model->data[$Model->alias][$parent]) {
+				return $this->_setParent($Model, $Model->data[$Model->alias][$parent], $created);
 			}
 		} elseif ($__parentChange) {
-			$this->settings[$model->alias]['__parentChange'] = false;
-			return $this->_setParent($model, $model->data[$model->alias][$parent]);
+			$this->settings[$Model->alias]['__parentChange'] = false;
+			return $this->_setParent($Model, $Model->data[$Model->alias][$parent]);
 		}
 	}
 /**
@@ -98,13 +98,13 @@ function afterSave(&$model, $created) {
  *
  * Will delete the current node and all children using the deleteAll method and sync the table
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @return boolean true to continue, false to abort the delete
  * @access public
  */
-	function beforeDelete(&$model) {
-		extract($this->settings[$model->alias]);
-		list($name, $data) = array($model->alias, $model->read());
+	function beforeDelete(&$Model) {
+		extract($this->settings[$Model->alias]);
+		list($name, $data) = array($Model->alias, $Model->read());
 		$data = $data[$name];
 
 		if (!$data[$right] || !$data[$left]) {
@@ -116,10 +116,10 @@ function beforeDelete(&$model) {
 			if (is_string($scope)) {
 				$scope = array($scope);
 			}
-			$scope[]["{$model->alias}.{$left} BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1);
-			$model->deleteAll($scope);
+			$scope[]["{$Model->alias}.{$left} BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1);
+			$Model->deleteAll($scope);
 		}
-		$this->__sync($model, $diff, '-', '> ' . $data[$right]);
+		$this->__sync($Model, $diff, '-', '> ' . $data[$right]);
 		return true;
 	}
 /**
@@ -130,56 +130,56 @@ function beforeDelete(&$model) {
  * this method bypassing the setParent logic.
  *
  * @since         1.2
- * @param AppModel $model
+ * @param AppModel $Model
  * @return boolean true to continue, false to abort the save
  * @access public
  */
-	function beforeSave(&$model) {
-		extract($this->settings[$model->alias]);
+	function beforeSave(&$Model) {
+		extract($this->settings[$Model->alias]);
 
-		if (isset($model->data[$model->alias][$model->primaryKey])) {
-			if ($model->data[$model->alias][$model->primaryKey]) {
-				if (!$model->id) {
-					$model->id = $model->data[$model->alias][$model->primaryKey];
+		if (isset($Model->data[$Model->alias][$Model->primaryKey])) {
+			if ($Model->data[$Model->alias][$Model->primaryKey]) {
+				if (!$Model->id) {
+					$Model->id = $Model->data[$Model->alias][$Model->primaryKey];
 				}
 			}
-			unset($model->data[$model->alias][$model->primaryKey]);
+			unset($Model->data[$Model->alias][$Model->primaryKey]);
 		}
 
-		$this->_addToWhitelist($model, array($left, $right));
-		if (!$model->id) {
-			if (array_key_exists($parent, $model->data[$model->alias]) && $model->data[$model->alias][$parent]) {
-				$parentNode = $model->find('first', array(
-					'conditions' => array($scope, $model->escapeField() => $model->data[$model->alias][$parent]),
-					'fields' => array($model->primaryKey, $right), 'recursive' => $recursive
+		$this->_addToWhitelist($Model, array($left, $right));
+		if (!$Model->id) {
+			if (array_key_exists($parent, $Model->data[$Model->alias]) && $Model->data[$Model->alias][$parent]) {
+				$parentNode = $Model->find('first', array(
+					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
+					'fields' => array($Model->primaryKey, $right), 'recursive' => $recursive
 				));
 				if (!$parentNode) {
 					return false;
 				}
 				list($parentNode) = array_values($parentNode);
-				$model->data[$model->alias][$left] = 0; //$parentNode[$right];
-				$model->data[$model->alias][$right] = 0; //$parentNode[$right] + 1;
+				$Model->data[$Model->alias][$left] = 0; //$parentNode[$right];
+				$Model->data[$Model->alias][$right] = 0; //$parentNode[$right] + 1;
 			} else {
-				$edge = $this->__getMax($model, $scope, $right, $recursive);
-				$model->data[$model->alias][$left] = $edge + 1;
-				$model->data[$model->alias][$right] = $edge + 2;
+				$edge = $this->__getMax($Model, $scope, $right, $recursive);
+				$Model->data[$Model->alias][$left] = $edge + 1;
+				$Model->data[$Model->alias][$right] = $edge + 2;
 			}
-		} elseif (array_key_exists($parent, $model->data[$model->alias])) {
-			if ($model->data[$model->alias][$parent] != $model->field($parent)) {
-				$this->settings[$model->alias]['__parentChange'] = true;
+		} elseif (array_key_exists($parent, $Model->data[$Model->alias])) {
+			if ($Model->data[$Model->alias][$parent] != $Model->field($parent)) {
+				$this->settings[$Model->alias]['__parentChange'] = true;
 			}
-			if (!$model->data[$model->alias][$parent]) {
-				$model->data[$model->alias][$parent] = null;
-				$this->_addToWhitelist($model, $parent);
+			if (!$Model->data[$Model->alias][$parent]) {
+				$Model->data[$Model->alias][$parent] = null;
+				$this->_addToWhitelist($Model, $parent);
 			} else {
-				list($node) = array_values($model->find('first', array(
-					'conditions' => array($scope,$model->escapeField() => $model->id),
-					'fields' => array($model->primaryKey, $parent, $left, $right ), 'recursive' => $recursive)
+				list($node) = array_values($Model->find('first', array(
+					'conditions' => array($scope,$Model->escapeField() => $Model->id),
+					'fields' => array($Model->primaryKey, $parent, $left, $right ), 'recursive' => $recursive)
 				));
 
-				$parentNode = $model->find('first', array(
-					'conditions' => array($scope, $model->escapeField() => $model->data[$model->alias][$parent]),
-					'fields' => array($model->primaryKey, $left, $right), 'recursive' => $recursive
+				$parentNode = $Model->find('first', array(
+					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
+					'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
 				));
 				if (!$parentNode) {
 					return false;
@@ -188,7 +188,7 @@ function beforeSave(&$model) {
 
 				if (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
 					return false;
-				} elseif ($node[$model->primaryKey] == $parentNode[$model->primaryKey]) {
+				} elseif ($node[$Model->primaryKey] == $parentNode[$Model->primaryKey]) {
 					return false;
 				}
 			}
@@ -201,33 +201,33 @@ function beforeSave(&$model) {
  * If the direct parameter is set to true, only the direct children are counted (based upon the parent_id field)
  * If false is passed for the id parameter, all top level nodes are counted, or all nodes are counted.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to read or false to read all top level nodes
  * @param boolean $direct whether to count direct, or all, children
  * @return integer number of child nodes
  * @access public
  */
-	function childcount(&$model, $id = null, $direct = false) {
+	function childcount(&$Model, $id = null, $direct = false) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
-		if ($id === null && $model->id) {
-			$id = $model->id;
+		if ($id === null && $Model->id) {
+			$id = $Model->id;
 		} elseif (!$id) {
 			$id = null;
 		}
-		extract($this->settings[$model->alias]);
+		extract($this->settings[$Model->alias]);
 
 		if ($direct) {
-			return $model->find('count', array('conditions' => array($scope, $model->escapeField($parent) => $id)));
+			return $Model->find('count', array('conditions' => array($scope, $Model->escapeField($parent) => $id)));
 		}
 
 		if ($id === null) {
-			return $model->find('count', array('conditions' => $scope));
-		} elseif (isset($model->data[$model->alias][$left]) && isset($model->data[$model->alias][$right])) {
-			$data = $model->data[$model->alias];
+			return $Model->find('count', array('conditions' => $scope));
+		} elseif (isset($Model->data[$Model->alias][$left]) && isset($Model->data[$Model->alias][$right])) {
+			$data = $Model->data[$Model->alias];
 		} else {
-			list($data) = array_values($model->find('first', array('conditions' => array($scope, $model->escapeField() => $id), 'recursive' => $recursive)));
+			list($data) = array_values($Model->find('first', array('conditions' => array($scope, $Model->escapeField() => $id), 'recursive' => $recursive)));
 		}
 		return ($data[$right] - $data[$left] - 1) / 2;
 	}
@@ -237,7 +237,7 @@ function childcount(&$model, $id = null, $direct = false) {
  * If the direct parameter is set to true, only the direct children are returned (based upon the parent_id field)
  * If false is passed for the id parameter, top level, or all (depending on direct parameter appropriate) are counted.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to read
  * @param boolean $direct whether to return only the direct, or all, children
  * @param mixed $fields Either a single string of a field name, or an array of field names
@@ -248,36 +248,36 @@ function childcount(&$model, $id = null, $direct = false) {
  * @return array Array of child nodes
  * @access public
  */
-	function children(&$model, $id = null, $direct = false, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) {
+	function children(&$Model, $id = null, $direct = false, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
 		$overrideRecursive = $recursive;
 
-		if ($id === null && $model->id) {
-			$id = $model->id;
+		if ($id === null && $Model->id) {
+			$id = $Model->id;
 		} elseif (!$id) {
 			$id = null;
 		}
-		$name = $model->alias;
-		extract($this->settings[$model->alias]);
+		$name = $Model->alias;
+		extract($this->settings[$Model->alias]);
 
 		if (!is_null($overrideRecursive)) {
 			$recursive = $overrideRecursive;
 		}
 		if (!$order) {
-			$order = $model->alias . '.' . $left . ' asc';
+			$order = $Model->alias . '.' . $left . ' asc';
 		}
 		if ($direct) {
-			$conditions = array($scope, $model->escapeField($parent) => $id);
-			return $model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+			$conditions = array($scope, $Model->escapeField($parent) => $id);
+			return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
 		}
 
 		if (!$id) {
 			$conditions = $scope;
 		} else {
-			$result = array_values($model->find('first', array(
-				'conditions' => array($scope, $model->escapeField() => $id),
+			$result = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $id),
 				'fields' => array($left, $right),
 				'recursive' => $recursive
 			)));
@@ -286,16 +286,16 @@ function children(&$model, $id = null, $direct = false, $fields = null, $order =
 				return array();
 			}
 			$conditions = array($scope,
-				$model->escapeField($right) . ' <' => $result[0][$right],
-				$model->escapeField($left) . ' >' => $result[0][$left]
+				$Model->escapeField($right) . ' <' => $result[0][$right],
+				$Model->escapeField($left) . ' >' => $result[0][$left]
 			);
 		}
-		return $model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+		return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
 	}
 /**
  * A convenience method for returning a hierarchical array used for HTML select boxes
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $conditions SQL conditions as a string or as an array('field' =>'value',...)
  * @param string $keyPath A string path to the key, i.e. "{n}.Post.id"
  * @param string $valuePath A string path to the value, i.e. "{n}.Post.title"
@@ -304,25 +304,25 @@ function children(&$model, $id = null, $direct = false, $fields = null, $order =
  * @return array An associative array of records, where the id is the key, and the display field is the value
  * @access public
  */
-	function generatetreelist(&$model, $conditions = null, $keyPath = null, $valuePath = null, $spacer = '_', $recursive = null) {
+	function generatetreelist(&$Model, $conditions = null, $keyPath = null, $valuePath = null, $spacer = '_', $recursive = null) {
 		$overrideRecursive = $recursive;
-		extract($this->settings[$model->alias]);
+		extract($this->settings[$Model->alias]);
 		if (!is_null($overrideRecursive)) {
 			$recursive = $overrideRecursive;
 		}
 
-		if ($keyPath == null && $valuePath == null && $model->hasField($model->displayField)) {
-			$fields = array($model->primaryKey, $model->displayField, $left, $right);
+		if ($keyPath == null && $valuePath == null && $Model->hasField($Model->displayField)) {
+			$fields = array($Model->primaryKey, $Model->displayField, $left, $right);
 		} else {
 			$fields = null;
 		}
 
 		if ($keyPath == null) {
-			$keyPath = '{n}.' . $model->alias . '.' . $model->primaryKey;
+			$keyPath = '{n}.' . $Model->alias . '.' . $Model->primaryKey;
 		}
 
 		if ($valuePath == null) {
-			$valuePath = array('{0}{1}', '{n}.tree_prefix', '{n}.' . $model->alias . '.' . $model->displayField);
+			$valuePath = array('{0}{1}', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField);
 
 		} elseif (is_string($valuePath)) {
 			$valuePath = array('{0}{1}', '{n}.tree_prefix', $valuePath);
@@ -331,16 +331,16 @@ function generatetreelist(&$model, $conditions = null, $keyPath = null, $valuePa
 			$valuePath[0] = '{' . (count($valuePath) - 1) . '}' . $valuePath[0];
 			$valuePath[] = '{n}.tree_prefix';
 		}
-		$order = $model->alias . '.' . $left . ' asc';
-		$results = $model->find('all', compact('conditions', 'fields', 'order', 'recursive'));
+		$order = $Model->alias . '.' . $left . ' asc';
+		$results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive'));
 		$stack = array();
 
 		foreach ($results as $i => $result) {
-			while ($stack && ($stack[count($stack) - 1] < $result[$model->alias][$right])) {
+			while ($stack && ($stack[count($stack) - 1] < $result[$Model->alias][$right])) {
 				array_pop($stack);
 			}
 			$results[$i]['tree_prefix'] = str_repeat($spacer,count($stack));
-			$stack[] = $result[$model->alias][$right];
+			$stack[] = $result[$Model->alias][$right];
 		}
 		if (empty($results)) {
 			return array();
@@ -352,29 +352,29 @@ function generatetreelist(&$model, $conditions = null, $keyPath = null, $valuePa
  *
  * reads the parent id and returns this node
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to read
  * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of data for the parent node
  * @access public
  */
-	function getparentnode(&$model, $id = null, $fields = null, $recursive = null) {
+	function getparentnode(&$Model, $id = null, $fields = null, $recursive = null) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
 		$overrideRecursive = $recursive;
 		if (empty ($id)) {
-			$id = $model->id;
+			$id = $Model->id;
 		}
-		extract($this->settings[$model->alias]);
+		extract($this->settings[$Model->alias]);
 		if (!is_null($overrideRecursive)) {
 			$recursive = $overrideRecursive;
 		}
-		$parentId = $model->read($parent, $id);
+		$parentId = $Model->read($parent, $id);
 
 		if ($parentId) {
-			$parentId = $parentId[$model->alias][$parent];
-			$parent = $model->find('first', array('conditions' => array($model->escapeField() => $parentId), 'fields' => $fields, 'recursive' => $recursive));
+			$parentId = $parentId[$Model->alias][$parent];
+			$parent = $Model->find('first', array('conditions' => array($Model->escapeField() => $parentId), 'fields' => $fields, 'recursive' => $recursive));
 
 			return $parent;
 		}
@@ -383,35 +383,35 @@ function getparentnode(&$model, $id = null, $fields = null, $recursive = null) {
 /**
  * Get the path to the given node
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to read
  * @param mixed $fields Either a single string of a field name, or an array of field names
  * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of nodes from top most parent to current node
  * @access public
  */
-	function getpath(&$model, $id = null, $fields = null, $recursive = null) {
+	function getpath(&$Model, $id = null, $fields = null, $recursive = null) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
 		$overrideRecursive = $recursive;
 		if (empty ($id)) {
-			$id = $model->id;
+			$id = $Model->id;
 		}
-		extract($this->settings[$model->alias]);
+		extract($this->settings[$Model->alias]);
 		if (!is_null($overrideRecursive)) {
 			$recursive = $overrideRecursive;
 		}
-		$result = $model->find('first', array('conditions' => array($model->escapeField() => $id), 'fields' => array($left, $right), 'recursive' => $recursive));
+		$result = $Model->find('first', array('conditions' => array($Model->escapeField() => $id), 'fields' => array($left, $right), 'recursive' => $recursive));
 		if ($result) {
 			$result = array_values($result);
 		} else {
 			return null;
 		}
 		$item = $result[0];
-		$results = $model->find('all', array(
-			'conditions' => array($scope, $model->escapeField($left) . ' <=' => $item[$left], $model->escapeField($right) . ' >=' => $item[$right]),
-			'fields' => $fields, 'order' => array($model->escapeField($left) => 'asc'), 'recursive' => $recursive
+		$results = $Model->find('all', array(
+			'conditions' => array($scope, $Model->escapeField($left) . ' <=' => $item[$left], $Model->escapeField($right) . ' >=' => $item[$right]),
+			'fields' => $fields, 'order' => array($Model->escapeField($left) => 'asc'), 'recursive' => $recursive
 		));
 		return $results;
 	}
@@ -420,13 +420,13 @@ function getpath(&$model, $id = null, $fields = null, $recursive = null) {
  *
  * If the node is the last child, or is a top level node with no subsequent node this method will return false
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to move
  * @param mixed $number how many places to move the node or true to move to last position
  * @return boolean true on success, false on failure
  * @access public
  */
-	function movedown(&$model, $id = null, $number = 1) {
+	function movedown(&$Model, $id = null, $number = 1) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
@@ -434,41 +434,41 @@ function movedown(&$model, $id = null, $number = 1) {
 			return false;
 		}
 		if (empty ($id)) {
-			$id = $model->id;
+			$id = $Model->id;
 		}
-		extract($this->settings[$model->alias]);
-		list($node) = array_values($model->find('first', array(
-			'conditions' => array($scope, $model->escapeField() => $id),
-			'fields' => array($model->primaryKey, $left, $right, $parent), 'recursive' => $recursive
+		extract($this->settings[$Model->alias]);
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $id),
+			'fields' => array($Model->primaryKey, $left, $right, $parent), 'recursive' => $recursive
 		)));
 		if ($node[$parent]) {
-			list($parentNode) = array_values($model->find('first', array(
-				'conditions' => array($scope, $model->escapeField() => $node[$parent]),
-				'fields' => array($model->primaryKey, $left, $right), 'recursive' => $recursive
+			list($parentNode) = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
+				'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
 			)));
 			if (($node[$right] + 1) == $parentNode[$right]) {
 				return false;
 			}
 		}
-		$nextNode = $model->find('first', array(
-			'conditions' => array($scope, $model->escapeField($left) => ($node[$right] + 1)),
-			'fields' => array($model->primaryKey, $left, $right), 'recursive' => $recursive)
+		$nextNode = $Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField($left) => ($node[$right] + 1)),
+			'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive)
 		);
 		if ($nextNode) {
 			list($nextNode)= array_values($nextNode);
 		} else {
 			return false;
 		}
-		$edge = $this->__getMax($model, $scope, $right, $recursive);
-		$this->__sync($model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right]);
-		$this->__sync($model, $nextNode[$left] - $node[$left], '-', 'BETWEEN ' . $nextNode[$left] . ' AND ' . $nextNode[$right]);
-		$this->__sync($model, $edge - $node[$left] - ($nextNode[$right] - $nextNode[$left]), '-', '> ' . $edge);
+		$edge = $this->__getMax($Model, $scope, $right, $recursive);
+		$this->__sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right]);
+		$this->__sync($Model, $nextNode[$left] - $node[$left], '-', 'BETWEEN ' . $nextNode[$left] . ' AND ' . $nextNode[$right]);
+		$this->__sync($Model, $edge - $node[$left] - ($nextNode[$right] - $nextNode[$left]), '-', '> ' . $edge);
 
 		if (is_int($number)) {
 			$number--;
 		}
 		if ($number) {
-			$this->moveDown($model, $id, $number);
+			$this->moveDown($Model, $id, $number);
 		}
 		return true;
 	}
@@ -477,13 +477,13 @@ function movedown(&$model, $id = null, $number = 1) {
  *
  * If the node is the first child, or is a top level node with no previous node this method will return false
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to move
  * @param mixed $number how many places to move the node, or true to move to first position
  * @return boolean true on success, false on failure
  * @access public
  */
-	function moveup(&$model, $id = null, $number = 1) {
+	function moveup(&$Model, $id = null, $number = 1) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
@@ -491,25 +491,25 @@ function moveup(&$model, $id = null, $number = 1) {
 			return false;
 		}
 		if (empty ($id)) {
-			$id = $model->id;
+			$id = $Model->id;
 		}
-		extract($this->settings[$model->alias]);
-		list($node) = array_values($model->find('first', array(
-			'conditions' => array($scope, $model->escapeField() => $id),
-			'fields' => array($model->primaryKey, $left, $right, $parent ), 'recursive' => $recursive
+		extract($this->settings[$Model->alias]);
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $id),
+			'fields' => array($Model->primaryKey, $left, $right, $parent ), 'recursive' => $recursive
 		)));
 		if ($node[$parent]) {
-			list($parentNode) = array_values($model->find('first', array(
-				'conditions' => array($scope, $model->escapeField() => $node[$parent]),
-				'fields' => array($model->primaryKey, $left, $right), 'recursive' => $recursive
+			list($parentNode) = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
+				'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
 			)));
 			if (($node[$left] - 1) == $parentNode[$left]) {
 				return false;
 			}
 		}
-		$previousNode = $model->find('first', array(
-			'conditions' => array($scope, $model->escapeField($right) => ($node[$left] - 1)),
-			'fields' => array($model->primaryKey, $left, $right),
+		$previousNode = $Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField($right) => ($node[$left] - 1)),
+			'fields' => array($Model->primaryKey, $left, $right),
 			'recursive' => $recursive
 		));
 
@@ -518,15 +518,15 @@ function moveup(&$model, $id = null, $number = 1) {
 		} else {
 			return false;
 		}
-		$edge = $this->__getMax($model, $scope, $right, $recursive);
-		$this->__sync($model, $edge - $previousNode[$left] +1, '+', 'BETWEEN ' . $previousNode[$left] . ' AND ' . $previousNode[$right]);
-		$this->__sync($model, $node[$left] - $previousNode[$left], '-', 'BETWEEN ' .$node[$left] . ' AND ' . $node[$right]);
-		$this->__sync($model, $edge - $previousNode[$left] - ($node[$right] - $node[$left]), '-', '> ' . $edge);
+		$edge = $this->__getMax($Model, $scope, $right, $recursive);
+		$this->__sync($Model, $edge - $previousNode[$left] +1, '+', 'BETWEEN ' . $previousNode[$left] . ' AND ' . $previousNode[$right]);
+		$this->__sync($Model, $node[$left] - $previousNode[$left], '-', 'BETWEEN ' .$node[$left] . ' AND ' . $node[$right]);
+		$this->__sync($Model, $edge - $previousNode[$left] - ($node[$right] - $node[$left]), '-', '> ' . $edge);
 		if (is_int($number)) {
 			$number--;
 		}
 		if ($number) {
-			$this->moveUp($model, $id, $number);
+			$this->moveUp($Model, $id, $number);
 		}
 		return true;
 	}
@@ -539,66 +539,66 @@ function moveup(&$model, $id = null, $number = 1) {
  * parameter only applies to "parent" mode and determines what to do if the parent field contains an id that is not present.
  *
  * @todo Could be written to be faster, *maybe*. Ideally using a subquery and putting all the logic burden on the DB.
- * @param AppModel $model
+ * @param AppModel $Model
  * @param string $mode parent or tree
  * @param mixed $missingParentAction 'return' to do nothing and return, 'delete' to
  * delete, or the id of the parent to set as the parent_id
  * @return boolean true on success, false on failure
  * @access public
  */
-	function recover(&$model, $mode = 'parent', $missingParentAction = null) {
+	function recover(&$Model, $mode = 'parent', $missingParentAction = null) {
 		if (is_array($mode)) {
 			extract (array_merge(array('mode' => 'parent'), $mode));
 		}
-		extract($this->settings[$model->alias]);
-		$model->recursive = $recursive;
+		extract($this->settings[$Model->alias]);
+		$Model->recursive = $recursive;
 		if ($mode == 'parent') {
-			$model->bindModel(array('belongsTo' => array('VerifyParent' => array(
-				'className' => $model->alias,
+			$Model->bindModel(array('belongsTo' => array('VerifyParent' => array(
+				'className' => $Model->alias,
 				'foreignKey' => $parent,
-				'fields' => array($model->primaryKey, $left, $right, $parent),
+				'fields' => array($Model->primaryKey, $left, $right, $parent),
 			))));
-			$missingParents = $model->find('list', array(
+			$missingParents = $Model->find('list', array(
 				'recursive' => 0,
 				'conditions' => array($scope, array(
-					'NOT' => array($model->escapeField($parent) => null), $model->VerifyParent->escapeField() => null
+					'NOT' => array($Model->escapeField($parent) => null), $Model->VerifyParent->escapeField() => null
 				))
 			));
-			$model->unbindModel(array('belongsTo' => array('VerifyParent')));
+			$Model->unbindModel(array('belongsTo' => array('VerifyParent')));
 			if ($missingParents) {
 				if ($missingParentAction == 'return') {
 					foreach ($missingParents as $id => $display) {
-						$this->errors[]	= 'cannot find the parent for ' . $model->alias . ' with id ' . $id . '(' . $display . ')';
+						$this->errors[]	= 'cannot find the parent for ' . $Model->alias . ' with id ' . $id . '(' . $display . ')';
 
 					}
 					return false;
 				} elseif ($missingParentAction == 'delete') {
-					$model->deleteAll(array($model->primaryKey => array_flip($missingParents)));
+					$Model->deleteAll(array($Model->primaryKey => array_flip($missingParents)));
 				} else {
-					$model->updateAll(array($parent => $missingParentAction), array($model->escapeField($model->primaryKey) => array_flip($missingParents)));
+					$Model->updateAll(array($parent => $missingParentAction), array($Model->escapeField($Model->primaryKey) => array_flip($missingParents)));
 				}
 			}
 			$count = 1;
-			foreach ($model->find('all', array('conditions' => $scope, 'fields' => array($model->primaryKey), 'order' => $left)) as $array) {
-				$model->id = $array[$model->alias][$model->primaryKey];
+			foreach ($Model->find('all', array('conditions' => $scope, 'fields' => array($Model->primaryKey), 'order' => $left)) as $array) {
+				$Model->id = $array[$Model->alias][$Model->primaryKey];
 				$lft = $count++;
 				$rght = $count++;
-				$model->save(array($left => $lft, $right => $rght), array('callbacks' => false));
+				$Model->save(array($left => $lft, $right => $rght), array('callbacks' => false));
 			}
-			foreach ($model->find('all', array('conditions' => $scope, 'fields' => array($model->primaryKey, $parent), 'order' => $left)) as $array) {
-				$model->create();
-				$model->id = $array[$model->alias][$model->primaryKey];
-				$this->_setParent($model, $array[$model->alias][$parent]);
+			foreach ($Model->find('all', array('conditions' => $scope, 'fields' => array($Model->primaryKey, $parent), 'order' => $left)) as $array) {
+				$Model->create();
+				$Model->id = $array[$Model->alias][$Model->primaryKey];
+				$this->_setParent($Model, $array[$Model->alias][$parent]);
 			}
 		} else {
-			foreach ($model->find('all', array('conditions' => $scope, 'fields' => array($model->primaryKey, $parent), 'order' => $left)) as $array) {
-				$path = $this->getpath($model, $array[$model->alias][$model->primaryKey]);
+			foreach ($Model->find('all', array('conditions' => $scope, 'fields' => array($Model->primaryKey, $parent), 'order' => $left)) as $array) {
+				$path = $this->getpath($Model, $array[$Model->alias][$Model->primaryKey]);
 				if ($path == null || count($path) < 2) {
 					$parentId = null;
 				} else {
-					$parentId = $path[count($path) - 2][$model->alias][$model->primaryKey];
+					$parentId = $path[count($path) - 2][$Model->alias][$Model->primaryKey];
 				}
-				$model->updateAll(array($parent => $parentId), array($model->escapeField() => $array[$model->alias][$model->primaryKey]));
+				$Model->updateAll(array($parent => $parentId), array($Model->escapeField() => $array[$Model->alias][$Model->primaryKey]));
 			}
 		}
 		return true;
@@ -611,28 +611,28 @@ function recover(&$model, $mode = 'parent', $missingParentAction = null) {
  *
  * Requires a valid tree, by default it verifies the tree before beginning.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param array $options
  * @return boolean true on success, false on failure
  */
-	function reorder(&$model, $options = array()) {
-		$options = array_merge(array('id' => null, 'field' => $model->displayField, 'order' => 'ASC', 'verify' => true), $options);
+	function reorder(&$Model, $options = array()) {
+		$options = array_merge(array('id' => null, 'field' => $Model->displayField, 'order' => 'ASC', 'verify' => true), $options);
 		extract($options);
-		if ($verify && !$this->verify($model)) {
+		if ($verify && !$this->verify($Model)) {
 			return false;
 		}
 		$verify = false;
-		extract($this->settings[$model->alias]);
-		$fields = array($model->primaryKey, $field, $left, $right);
+		extract($this->settings[$Model->alias]);
+		$fields = array($Model->primaryKey, $field, $left, $right);
 		$sort = $field . ' ' . $order;
-		$nodes = $this->children($model, $id, true, $fields, $sort, null, null, $recursive);
+		$nodes = $this->children($Model, $id, true, $fields, $sort, null, null, $recursive);
 
 		if ($nodes) {
 			foreach ($nodes as $node) {
-				$id = $node[$model->alias][$model->primaryKey];
-				$this->moveDown($model, $id, true);
-				if ($node[$model->alias][$left] != $node[$model->alias][$right] - 1) {
-					$this->reorder($model, compact('id', 'field', 'order', 'verify'));
+				$id = $node[$Model->alias][$Model->primaryKey];
+				$this->moveDown($Model, $id, true);
+				if ($node[$Model->alias][$left] != $node[$Model->alias][$right] - 1) {
+					$this->reorder($Model, compact('id', 'field', 'order', 'verify'));
 				}
 			}
 		}
@@ -644,63 +644,63 @@ function reorder(&$model, $options = array()) {
  * If the parameter delete is false, the node will become a new top level node. Otherwise the node will be deleted
  * after the children are reparented.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $id The ID of the record to remove
  * @param boolean $delete whether to delete the node after reparenting children (if any)
  * @return boolean true on success, false on failure
  * @access public
  */
-	function removefromtree(&$model, $id = null, $delete = false) {
+	function removefromtree(&$Model, $id = null, $delete = false) {
 		if (is_array($id)) {
 			extract (array_merge(array('id' => null), $id));
 		}
-		extract($this->settings[$model->alias]);
+		extract($this->settings[$Model->alias]);
 
-		list($node) = array_values($model->find('first', array(
-			'conditions' => array($scope, $model->escapeField() => $id),
-			'fields' => array($model->primaryKey, $left, $right, $parent),
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $id),
+			'fields' => array($Model->primaryKey, $left, $right, $parent),
 			'recursive' => $recursive
 		)));
 
 		if ($node[$right] == $node[$left] + 1) {
 			if ($delete) {
-				return $model->delete($id);
+				return $Model->delete($id);
 			} else {
-				$model->id = $id;
-				return $model->saveField($parent, null);
+				$Model->id = $id;
+				return $Model->saveField($parent, null);
 			}
 		} elseif ($node[$parent]) {
-			list($parentNode) = array_values($model->find('first', array(
-				'conditions' => array($scope, $model->escapeField() => $node[$parent]),
-				'fields' => array($model->primaryKey, $left, $right),
+			list($parentNode) = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
+				'fields' => array($Model->primaryKey, $left, $right),
 				'recursive' => $recursive
 			)));
 		} else {
 			$parentNode[$right] = $node[$right] + 1;
 		}
 
-		$model->updateAll(array($parent => $node[$parent]), array($parent => $node[$model->primaryKey]));
-		$this->__sync($model, 1, '-', 'BETWEEN ' . ($node[$left] + 1) . ' AND ' . ($node[$right] - 1));
-		$this->__sync($model, 2, '-', '> ' . ($node[$right]));
-		$model->id = $id;
+		$Model->updateAll(array($parent => $node[$parent]), array($parent => $node[$Model->primaryKey]));
+		$this->__sync($Model, 1, '-', 'BETWEEN ' . ($node[$left] + 1) . ' AND ' . ($node[$right] - 1));
+		$this->__sync($Model, 2, '-', '> ' . ($node[$right]));
+		$Model->id = $id;
 
 		if ($delete) {
-			$model->updateAll(
+			$Model->updateAll(
 				array(
-					$model->escapeField($left) => 0,
-					$model->escapeField($right) => 0,
-					$model->escapeField($parent) => null
+					$Model->escapeField($left) => 0,
+					$Model->escapeField($right) => 0,
+					$Model->escapeField($parent) => null
 				),
-				array($model->escapeField() => $id)
+				array($Model->escapeField() => $id)
 			);
-			return $model->delete($id);
+			return $Model->delete($id);
 		} else {
-			$edge = $this->__getMax($model, $scope, $right, $recursive);
+			$edge = $this->__getMax($Model, $scope, $right, $recursive);
 			if ($node[$right] == $edge) {
 				$edge = $edge - 2;
 			}
-			$model->id = $id;
-			return $model->save(
+			$Model->id = $id;
+			return $Model->save(
 				array($left => $edge + 1, $right => $edge + 2, $parent => null),
 				array('callbacks' => false)
 			);
@@ -711,23 +711,23 @@ function removefromtree(&$model, $id = null, $delete = false) {
  *
  * Returns true if the tree is valid otherwise an array of (type, incorrect left/right index, message)
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @return mixed true if the tree is valid or empty, otherwise an array of (error type [index, node],
  *  [incorrect left/right index,node id], message)
  * @access public
  */
-	function verify(&$model) {
-		extract($this->settings[$model->alias]);
-		if (!$model->find('count', array('conditions' => $scope))) {
+	function verify(&$Model) {
+		extract($this->settings[$Model->alias]);
+		if (!$Model->find('count', array('conditions' => $scope))) {
 			return true;
 		}
-		$min = $this->__getMin($model, $scope, $left, $recursive);
-		$edge = $this->__getMax($model, $scope, $right, $recursive);
+		$min = $this->__getMin($Model, $scope, $left, $recursive);
+		$edge = $this->__getMax($Model, $scope, $right, $recursive);
 		$errors =  array();
 
 		for ($i = $min; $i <= $edge; $i++) {
-			$count = $model->find('count', array('conditions' => array(
-				$scope, 'OR' => array($model->escapeField($left) => $i, $model->escapeField($right) => $i)
+			$count = $Model->find('count', array('conditions' => array(
+				$scope, 'OR' => array($Model->escapeField($left) => $i, $Model->escapeField($right) => $i)
 			)));
 			if ($count != 1) {
 				if ($count == 0) {
@@ -737,37 +737,37 @@ function verify(&$model) {
 				}
 			}
 		}
-		$node = $model->find('first', array('conditions' => array($scope, $model->escapeField($right) . '< ' . $model->escapeField($left)), 'recursive' => 0));
+		$node = $Model->find('first', array('conditions' => array($scope, $Model->escapeField($right) . '< ' . $Model->escapeField($left)), 'recursive' => 0));
 		if ($node) {
-			$errors[] = array('node', $node[$model->alias][$model->primaryKey], 'left greater than right.');
+			$errors[] = array('node', $node[$Model->alias][$Model->primaryKey], 'left greater than right.');
 		}
 
-		$model->bindModel(array('belongsTo' => array('VerifyParent' => array(
-			'className' => $model->alias,
+		$Model->bindModel(array('belongsTo' => array('VerifyParent' => array(
+			'className' => $Model->alias,
 			'foreignKey' => $parent,
-			'fields' => array($model->primaryKey, $left, $right, $parent)
+			'fields' => array($Model->primaryKey, $left, $right, $parent)
 		))));
 
-		foreach ($model->find('all', array('conditions' => $scope, 'recursive' => 0)) as $instance) {
-			if (is_null($instance[$model->alias][$left]) || is_null($instance[$model->alias][$right])) {
-				$errors[] = array('node', $instance[$model->alias][$model->primaryKey],
+		foreach ($Model->find('all', array('conditions' => $scope, 'recursive' => 0)) as $instance) {
+			if (is_null($instance[$Model->alias][$left]) || is_null($instance[$Model->alias][$right])) {
+				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
 					'has invalid left or right values');
-			} elseif ($instance[$model->alias][$left] == $instance[$model->alias][$right]) {
-				$errors[] = array('node', $instance[$model->alias][$model->primaryKey],
+			} elseif ($instance[$Model->alias][$left] == $instance[$Model->alias][$right]) {
+				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
 					'left and right values identical');
-			} elseif ($instance[$model->alias][$parent]) {
-				if (!$instance['VerifyParent'][$model->primaryKey]) {
-					$errors[] = array('node', $instance[$model->alias][$model->primaryKey],
-						'The parent node ' . $instance[$model->alias][$parent] . ' doesn\'t exist');
-				} elseif ($instance[$model->alias][$left] < $instance['VerifyParent'][$left]) {
-					$errors[] = array('node', $instance[$model->alias][$model->primaryKey],
-						'left less than parent (node ' . $instance['VerifyParent'][$model->primaryKey] . ').');
-				} elseif ($instance[$model->alias][$right] > $instance['VerifyParent'][$right]) {
-					$errors[] = array('node', $instance[$model->alias][$model->primaryKey],
-						'right greater than parent (node ' . $instance['VerifyParent'][$model->primaryKey] . ').');
+			} elseif ($instance[$Model->alias][$parent]) {
+				if (!$instance['VerifyParent'][$Model->primaryKey]) {
+					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+						'The parent node ' . $instance[$Model->alias][$parent] . ' doesn\'t exist');
+				} elseif ($instance[$Model->alias][$left] < $instance['VerifyParent'][$left]) {
+					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+						'left less than parent (node ' . $instance['VerifyParent'][$Model->primaryKey] . ').');
+				} elseif ($instance[$Model->alias][$right] > $instance['VerifyParent'][$right]) {
+					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+						'right greater than parent (node ' . $instance['VerifyParent'][$Model->primaryKey] . ').');
 				}
-			} elseif ($model->find('count', array('conditions' => array($scope, $model->escapeField($left) . ' <' => $instance[$model->alias][$left], $model->escapeField($right) . ' >' => $instance[$model->alias][$right]), 'recursive' => 0))) {
-				$errors[] = array('node', $instance[$model->alias][$model->primaryKey], 'The parent field is blank, but has a parent');
+			} elseif ($Model->find('count', array('conditions' => array($scope, $Model->escapeField($left) . ' <' => $instance[$Model->alias][$left], $Model->escapeField($right) . ' >' => $instance[$Model->alias][$right]), 'recursive' => 0))) {
+				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey], 'The parent field is blank, but has a parent');
 			}
 		}
 		if ($errors) {
@@ -782,27 +782,27 @@ function verify(&$model) {
  * of recovering a corrupted table, or creating new nodes. Otherwise it should always be false. In reality this
  * method could be private, since calling save with parent_id set also calls setParent
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param mixed $parentId
  * @return boolean true on success, false on failure
  * @access protected
  */
-	function _setParent(&$model, $parentId = null, $created = false) {
-		extract($this->settings[$model->alias]);
-		list($node) = array_values($model->find('first', array(
-			'conditions' => array($scope, $model->escapeField() => $model->id),
-			'fields' => array($model->primaryKey, $parent, $left, $right),
+	function _setParent(&$Model, $parentId = null, $created = false) {
+		extract($this->settings[$Model->alias]);
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $Model->id),
+			'fields' => array($Model->primaryKey, $parent, $left, $right),
 			'recursive' => $recursive
 		)));
-		$edge = $this->__getMax($model, $scope, $right, $recursive, $created);
+		$edge = $this->__getMax($Model, $scope, $right, $recursive, $created);
 
 		if (empty ($parentId)) {
-			$this->__sync($model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
-			$this->__sync($model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created);
+			$this->__sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
+			$this->__sync($Model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created);
 		} else {
-			$parentNode = array_values($model->find('first', array(
-				'conditions' => array($scope, $model->escapeField() => $parentId),
-				'fields' => array($model->primaryKey, $left, $right),
+			$parentNode = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $parentId),
+				'fields' => array($Model->primaryKey, $left, $right),
 				'recursive' => $recursive
 			)));
 
@@ -811,34 +811,34 @@ function _setParent(&$model, $parentId = null, $created = false) {
 			}
 			$parentNode = $parentNode[0];
 
-			if (($model->id == $parentId)) {
+			if (($Model->id == $parentId)) {
 				return false;
 
 			} elseif (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
 				return false;
 			}
 			if (empty ($node[$left]) && empty ($node[$right])) {
-				$this->__sync($model, 2, '+', '>= ' . $parentNode[$right], $created);
-				$result = $model->save(
+				$this->__sync($Model, 2, '+', '>= ' . $parentNode[$right], $created);
+				$result = $Model->save(
 					array($left => $parentNode[$right], $right => $parentNode[$right] + 1, $parent => $parentId),
 					array('validate' => false, 'callbacks' => false)
 				);
-				$model->data = $result;
+				$Model->data = $result;
 			} else {
-				$this->__sync($model, $edge - $node[$left] +1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
+				$this->__sync($Model, $edge - $node[$left] +1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
 				$diff = $node[$right] - $node[$left] + 1;
 
 				if ($node[$left] > $parentNode[$left]) {
 					if ($node[$right] < $parentNode[$right]) {
-						$this->__sync($model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
-						$this->__sync($model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
+						$this->__sync($Model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
+						$this->__sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
 					} else {
-						$this->__sync($model, $diff, '+', 'BETWEEN ' . $parentNode[$right] . ' AND ' . $node[$right], $created);
-						$this->__sync($model, $edge - $parentNode[$right] + 1, '-', '> ' . $edge, $created);
+						$this->__sync($Model, $diff, '+', 'BETWEEN ' . $parentNode[$right] . ' AND ' . $node[$right], $created);
+						$this->__sync($Model, $edge - $parentNode[$right] + 1, '-', '> ' . $edge, $created);
 					}
 				} else {
-					$this->__sync($model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
-					$this->__sync($model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
+					$this->__sync($Model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
+					$this->__sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
 				}
 			}
 		}
@@ -847,25 +847,25 @@ function _setParent(&$model, $parentId = null, $created = false) {
 /**
  * get the maximum index value in the table.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param string $scope
  * @param string $right
  * @return int
  * @access private
  */
-	function __getMax($model, $scope, $right, $recursive = -1, $created = false) {
-		$db =& ConnectionManager::getDataSource($model->useDbConfig);
+	function __getMax($Model, $scope, $right, $recursive = -1, $created = false) {
+		$db =& ConnectionManager::getDataSource($Model->useDbConfig);
 		if ($created) {
 			if (is_string($scope)) {
-				$scope .= " AND {$model->alias}.{$model->primaryKey} <> ";
-				$scope .= $db->value($model->id, $model->getColumnType($model->primaryKey));
+				$scope .= " AND {$Model->alias}.{$Model->primaryKey} <> ";
+				$scope .= $db->value($Model->id, $Model->getColumnType($Model->primaryKey));
 			} else {
-				$scope['NOT'][$model->alias . '.' . $model->primaryKey] = $model->id;
+				$scope['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
 			}
 		}
-		list($edge) = array_values($model->find('first', array(
+		list($edge) = array_values($Model->find('first', array(
 			'conditions' => $scope,
-			'fields' => $db->calculate($model, 'max', array($right)),
+			'fields' => $db->calculate($Model, 'max', array($right)),
 			'recursive' => $recursive
 		)));
 		return (empty($edge[$right])) ? 0 : $edge[$right];
@@ -873,17 +873,17 @@ function __getMax($model, $scope, $right, $recursive = -1, $created = false) {
 /**
  * get the minimum index value in the table.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param string $scope
  * @param string $right
  * @return int
  * @access private
  */
-	function __getMin($model, $scope, $left, $recursive = -1) {
-		$db =& ConnectionManager::getDataSource($model->useDbConfig);
-		list($edge) = array_values($model->find('first', array(
+	function __getMin($Model, $scope, $left, $recursive = -1) {
+		$db =& ConnectionManager::getDataSource($Model->useDbConfig);
+		list($edge) = array_values($Model->find('first', array(
 			'conditions' => $scope,
-			'fields' => $db->calculate($model, 'min', array($left)),
+			'fields' => $db->calculate($Model, 'min', array($left)),
 			'recursive' => $recursive
 		)));
 		return (empty($edge[$left])) ? 0 : $edge[$left];
@@ -893,33 +893,33 @@ function __getMin($model, $scope, $left, $recursive = -1) {
  *
  * Handles table sync operations, Taking account of the behavior scope.
  *
- * @param AppModel $model
+ * @param AppModel $Model
  * @param integer $shift
  * @param string $direction
  * @param array $conditions
  * @param string $field
  * @access private
  */
-	function __sync(&$model, $shift, $dir = '+', $conditions = array(), $created = false, $field = 'both') {
-		$modelRecursive = $model->recursive;
-		extract($this->settings[$model->alias]);
-		$model->recursive = $recursive;
+	function __sync(&$Model, $shift, $dir = '+', $conditions = array(), $created = false, $field = 'both') {
+		$ModelRecursive = $Model->recursive;
+		extract($this->settings[$Model->alias]);
+		$Model->recursive = $recursive;
 
 		if ($field == 'both') {
-			$this->__sync($model, $shift, $dir, $conditions, $created, $left);
+			$this->__sync($Model, $shift, $dir, $conditions, $created, $left);
 			$field = $right;
 		}
 		if (is_string($conditions)) {
-			$conditions = array("{$model->alias}.{$field} {$conditions}");
+			$conditions = array("{$Model->alias}.{$field} {$conditions}");
 		}
 		if (($scope != '1 = 1' && $scope !== true) && $scope) {
 			$conditions[] = $scope;
 		}
 		if ($created) {
-			$conditions['NOT'][$model->alias . '.' . $model->primaryKey] = $model->id;
+			$conditions['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
 		}
-		$model->updateAll(array($model->alias . '.' . $field => $model->escapeField($field) . ' ' . $dir . ' ' . $shift), $conditions);
-		$model->recursive = $modelRecursive;
+		$Model->updateAll(array($Model->alias . '.' . $field => $Model->escapeField($field) . ' ' . $dir . ' ' . $shift), $conditions);
+		$Model->recursive = $ModelRecursive;
 	}
 }
 ?>
\ No newline at end of file