adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing eval() calls from Session and replacing with Set methods

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4545 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-02-20 19:51:58 +00:00
parent e24b44e266
commit cb511b95ed
2 changed files with 70 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
cake/libs/session.php
View file

@ -107,6 +107,13 @@ class CakeSession extends Object {
* @access public
*/
var $sessionTime = false;
/**
* Keeps track of keys to watch for writes on
*
* @var array
* @access public
*/
var $watchKeys = array();
/**
* Constructor.
*
@ -198,12 +205,33 @@ class CakeSession extends Object {
if (empty($var)) {
return false;
}
eval ("unset($var);");
return true;
if (in_array($var, $this->watchKeys)) {
trigger_error('Deleting session key {' . $var . '}', E_USER_NOTICE);
}
$this->__overwrite($_SESSION, Set::remove($_SESSION, $var));
return ($this->check($var) == false);
}
$this->__setError(2, "$name doesn't exist");
return false;
}
/**
* Used to write new data to _SESSION, since PHP doesn't like us setting the _SESSION var itself
*
* @param array $old
* @param array $new
* @return void
* @access private
*/
function __overwrite(&$old, $new) {
foreach ($old as $key => $var) {
if (!isset($new[$key])) {
unset($old[$key]);
}
}
foreach ($new as $key => $var) {
$old[$key] = $var;
}
}
/**
* Return error description for given error number.
*
@ -275,12 +303,44 @@ class CakeSession extends Object {
$this->__setError(2, "No Session vars set");
return false;
}
/**
* Tells Session to write a notification when a certain session path or subpath is written to
*
* @param mixed $var The variable path to watch
* @return void
*/
function watch($var) {
$var = $this->__validateKeys($var);
if (empty($var)) {
return false;
}
$this->watchKeys[] = $var;
}
/**
* Tells Session to stop watching a given key path
*
* @param mixed $var The variable path to watch
* @return void
*/
function ignore($var) {
$var = $this->__validateKeys($var);
if (!in_array($var, $this->watchKeys)) {
return;
}
foreach ($this->watchKeys as $i => $key) {
if ($key == $var) {
unset($this->watchKeys[$i]);
$this->watchKeys = array_values($this->watchKeys);
return;
}
}
}
/**
* Writes value to given session variable name.
*
* @param mixed $name
* @param string $value
* @return void
* @return boolean True if the write was successful, false if the write failed
*/
function write($name, $value) {
$var = $this->__validateKeys($name);
@ -288,8 +348,11 @@ class CakeSession extends Object {
if (empty($var)) {
return false;
}
$result = Set::insert($_SESSION, $var, $value);
return (!empty($result));
if (in_array($var, $this->watchKeys)) {
trigger_error('Writing session key {' . $var . '}: ' . Debugger::exportVar($value), E_USER_NOTICE);
}
$this->__overwrite($_SESSION, Set::insert($_SESSION, $var, $value));
return (Set::extract($_SESSION, $var) == $value);
}
/**
* Method called on close of a database
@ -442,7 +505,7 @@ class CakeSession extends Object {
*
*/
function __checkValid() {
if ($this->read("Config")) {
if ($this->read('Config')) {
if ($this->_userAgent == $this->read("Config.userAgent") && $this->time <= $this->read("Config.time")) {
$this->write("Config.time", $this->sessionTime);
$this->valid = true;

2
cake/libs/set.php
View file

@ -252,7 +252,7 @@ class Set extends Object {
* @param mixed $path A dot-separated string.
* @return array
*/
function insert(&$list, $path, $data = null) {
function insert($list, $path, $data = null) {
if (empty($data) && is_a($this, 'Set')) {
$data = $path;
$path = $list;