adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #728 from boast/patch-2

Browse source 
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
This commit is contained in:
Mark Story 2012-08-01 19:41:04 -07:00
commit 2728c6253e
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -70,8 +70,8 @@ class TreeBehavior extends ModelBehavior {
if (in_array($settings['scope'], $Model->getAssociated('belongsTo'))) { if (in_array($settings['scope'], $Model->getAssociated('belongsTo'))) {
$data = $Model->getAssociated($settings['scope']); $data = $Model->getAssociated($settings['scope']);
$parent = $Model->{$settings['scope']}; $Parent = $Model->{$settings['scope']};
$settings['scope'] = $Model->alias . '.' . $data['foreignKey'] . ' = ' . $parent->alias . '.' . $parent->primaryKey; $settings['scope'] = $Model->escapeField($data['foreignKey']) . ' = ' . $Parent->escapeField();
$settings['recursive'] = 0; $settings['recursive'] = 0;
} }
$this->settings[$Model->alias] = $settings; $this->settings[$Model->alias] = $settings;
@ -125,8 +125,8 @@ class TreeBehavior extends ModelBehavior {
public function beforeDelete(Model $Model, $cascade = true) { public function beforeDelete(Model $Model, $cascade = true) {
extract($this->settings[$Model->alias]); extract($this->settings[$Model->alias]);
$data = $Model->find('first', array( $data = $Model->find('first', array(
'conditions' => array($Model->alias . '.' . $Model->primaryKey => $Model->id), 'conditions' => array($Model->escapeField($Model->primaryKey) => $Model->id),
'fields' => array($Model->alias . '.' . $left, $Model->alias . '.' . $right), 'fields' => array($Model->escapeField($left), $Model->escapeField($right)),
'recursive' => -1)); 'recursive' => -1));
if ($data) { if ($data) {
$this->_deletedRow = current($data); $this->_deletedRow = current($data);
@ -156,7 +156,7 @@ class TreeBehavior extends ModelBehavior {
if (is_string($scope)) { if (is_string($scope)) {
$scope = array($scope); $scope = array($scope);
} }
$scope[]["{$Model->alias}.{$left} BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1); $scope[][$Model->escapeField($left) . " BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1);
$Model->deleteAll($scope); $Model->deleteAll($scope);
} }
$this->_sync($Model, $diff, '-', '> ' . $data[$right]); $this->_sync($Model, $diff, '-', '> ' . $data[$right]);
@ -308,7 +308,7 @@ class TreeBehavior extends ModelBehavior {
$recursive = $overrideRecursive; $recursive = $overrideRecursive;
} }
if (!$order) { if (!$order) {
$order = $Model->alias . '.' . $left . ' asc'; $order = $Model->escapeField($left) . " asc";
} }
if ($direct) { if ($direct) {
$conditions = array($scope, $Model->escapeField($parent) => $id); $conditions = array($scope, $Model->escapeField($parent) => $id);
@ -373,7 +373,7 @@ class TreeBehavior extends ModelBehavior {
} else { } else {
array_unshift($valuePath, '%s' . $valuePath[0], '{n}.tree_prefix'); array_unshift($valuePath, '%s' . $valuePath[0], '{n}.tree_prefix');
} }
$order = $Model->alias . '.' . $left . ' asc'; $order = $Model->escapeField($left) . " asc";
$results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive')); $results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive'));
$stack = array(); $stack = array();
@ -933,13 +933,13 @@ class TreeBehavior extends ModelBehavior {
$db = ConnectionManager::getDataSource($Model->useDbConfig); $db = ConnectionManager::getDataSource($Model->useDbConfig);
if ($created) { if ($created) {
if (is_string($scope)) { if (is_string($scope)) {
$scope .= " AND {$Model->alias}.{$Model->primaryKey} <> "; $scope .= " AND " . $Model->escapeField() . " <> ";
$scope .= $db->value($Model->id, $Model->getColumnType($Model->primaryKey)); $scope .= $db->value($Model->id, $Model->getColumnType($Model->primaryKey));
} else { } else {
$scope['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id; $scope['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
} }
} }
$name = $Model->alias . '.' . $right; $name = $Model->escapeField($right);
list($edge) = array_values($Model->find('first', array( list($edge) = array_values($Model->find('first', array(
'conditions' => $scope, 'conditions' => $scope,
'fields' => $db->calculate($Model, 'max', array($name, $right)), 'fields' => $db->calculate($Model, 'max', array($name, $right)),
@ -959,7 +959,7 @@ class TreeBehavior extends ModelBehavior {
*/ */
protected function _getMin(Model $Model, $scope, $left, $recursive = -1) { protected function _getMin(Model $Model, $scope, $left, $recursive = -1) {
$db = ConnectionManager::getDataSource($Model->useDbConfig); $db = ConnectionManager::getDataSource($Model->useDbConfig);
$name = $Model->alias . '.' . $left; $name = $Model->escapeField($left);
list($edge) = array_values($Model->find('first', array( list($edge) = array_values($Model->find('first', array(
'conditions' => $scope, 'conditions' => $scope,
'fields' => $db->calculate($Model, 'min', array($name, $left)), 'fields' => $db->calculate($Model, 'min', array($name, $left)),
@ -991,15 +991,15 @@ class TreeBehavior extends ModelBehavior {
$field = $right; $field = $right;
} }
if (is_string($conditions)) { if (is_string($conditions)) {
$conditions = array("{$Model->alias}.{$field} {$conditions}"); $conditions = array($Model->escapeField($field) . " {$conditions}");
} }
if (($scope != '1 = 1' && $scope !== true) && $scope) { if (($scope != '1 = 1' && $scope !== true) && $scope) {
$conditions[] = $scope; $conditions[] = $scope;
} }
if ($created) { if ($created) {
$conditions['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id; $conditions['NOT'][$Model->escapeField()] = $Model->id;
} }
$Model->updateAll(array($Model->alias . '.' . $field => $Model->escapeField($field) . ' ' . $dir . ' ' . $shift), $conditions); $Model->updateAll(array($Model->escapeField($field) => $Model->escapeField($field) . ' ' . $dir . ' ' . $shift), $conditions);
$Model->recursive = $ModelRecursive; $Model->recursive = $ModelRecursive;
} }