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

Merging:

Browse source 
Revision: [1729]
Fixed loading - added model, cakesession, security.
Now loads properly.

Revision: [1728]
Fixing problems found in the way Cake handles sessions.
These updates seem to work properly now.
Added gethost() to basics.php to replace using gethostbyaddr which can be very slow.
Added session_write_close(); in Controller::redirect();

Revision: [1719]
Fix scaffold show.thtml undefined index error

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1730 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-01-06 04:46:42 +00:00
parent 1867e6503a
commit 28cb84e549
5 changed files with 99 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cake/basics.php
View file

@ -482,4 +482,19 @@ function setUri()
} }
return $uri; return $uri;
} }
function gethost ($ip)
{
if (stristr(getenv('OS'), 'windows'))
{
$host = split('Name:',`nslookup $ip`);
return ( trim (isset($host[1]) ? str_replace ("\n".'Address: '.$ip, '', $host[1]) : $ip));
}
else
{
$host = `host $ip`;
return (($host ? end ( explode (' ', $host)) : $ip));
}
}
?> ?>

4
cake/libs/controller/controller.php
View file

@ -299,6 +299,10 @@ class Controller extends Object
{ {
$url = '/'.$url; $url = '/'.$url;
} }
if (function_exists('session_write_close'))
{
session_write_close();
}
header ('Location: '.$this->base.$url); header ('Location: '.$this->base.$url);
} }

161
cake/libs/session.php
View file

@ -81,7 +81,6 @@ class CakeSession extends Object
* @var unknown_type * @var unknown_type
*/ */
var $sessionId = null; var $sessionId = null;
/** /**
* Enter description here... * Enter description here...
* *
@ -93,47 +92,46 @@ class CakeSession extends Object
* *
* @return unknown * @return unknown
*/ */
function __construct($base = null) function __construct($base = null)
{ {
$this->host = $_SERVER['HTTP_HOST']; $this->host = $_SERVER['HTTP_HOST'];
if (empty($base)) if (empty($base))
{ {
$this->path = '/'; $this->path = '/';
} }
else else
{ {
$this->path = $base; $this->path = $base;
} }
if (strpos($this->host, ':') !== false) if (strpos($this->host, ':') !== false)
{ {
$this->host = substr($this->host,0, strpos($this->host, ':')); $this->host = substr($this->host,0, strpos($this->host, ':'));
} }
if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
{ {
$this->ip = $_SERVER['HTTP_X_FORWARDED_FOR']; $this->ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
} }
else else
{ {
$this->ip = $_SERVER['REMOTE_ADDR']; $this->ip = $_SERVER['REMOTE_ADDR'];
} }
if(!empty($_SERVER['HTTP_USER_AGENT'])) if(!empty($_SERVER['HTTP_USER_AGENT']))
{ {
$this->userAgent = md5($_SERVER['HTTP_USER_AGENT']); $this->userAgent = md5($_SERVER['HTTP_USER_AGENT']);
} }
else else
{ {
$this->userAgent = ""; $this->userAgent = "";
} }
$this->security = CAKE_SECURITY; $this->security = CAKE_SECURITY;
$this->_initSession(); $this->_initSession();
$this->_begin(); $this->_begin();
parent::__construct(); parent::__construct();
} }
/** /**
@ -191,7 +189,6 @@ class CakeSession extends Object
*/ */
function getLastError() function getLastError()
{ {
if($this->lastError) if($this->lastError)
{ {
return $this->getError($this->lastError); return $this->getError($this->lastError);
@ -209,7 +206,6 @@ class CakeSession extends Object
*/ */
function isValid() function isValid()
{ {
return $this->valid; return $this->valid;
} }
@ -243,7 +239,6 @@ class CakeSession extends Object
*/ */
function returnSessionVars() function returnSessionVars()
{ {
if(!empty($_SESSION)) if(!empty($_SESSION))
{ {
$result = eval("return ".$_SESSION.";"); $result = eval("return ".$_SESSION.";");
@ -261,7 +256,6 @@ class CakeSession extends Object
*/ */
function writeSessionVar($name, $value) function writeSessionVar($name, $value)
{ {
$expression = $this->_sessionVarNames($name); $expression = $this->_sessionVarNames($name);
$expression .= " = \$value;"; $expression .= " = \$value;";
eval($expression); eval($expression);
@ -274,12 +268,6 @@ class CakeSession extends Object
*/ */
function _begin() function _begin()
{ {
if (function_exists('session_write_close'))
{
session_write_close();
}
session_cache_limiter("must-revalidate"); session_cache_limiter("must-revalidate");
session_start(); session_start();
$this->_new(); $this->_new();
@ -331,6 +319,10 @@ class CakeSession extends Object
*/ */
function _initSession() function _initSession()
{ {
if (function_exists('session_write_close'))
{
session_write_close();
}
switch ($this->security) switch ($this->security)
{ {
@ -404,7 +396,6 @@ class CakeSession extends Object
} }
break; break;
} }
} }
/** /**
@ -415,8 +406,7 @@ class CakeSession extends Object
*/ */
function _new() function _new()
{ {
if(!ereg("\.aol\.com$", gethost($this->ip)))
if(!ereg("proxy\.aol\.com$", @gethostbyaddr($this->ip)))
{ {
if($this->readSessionVar("Config")) if($this->readSessionVar("Config"))
{ {
@ -430,26 +420,26 @@ class CakeSession extends Object
$this->_setError(1, "Session Highjacking Attempted !!!"); $this->_setError(1, "Session Highjacking Attempted !!!");
} }
} }
else else
{ {
srand((double)microtime() * 1000000); srand((double)microtime() * 1000000);
$this->writeSessionVar('Config.rand', rand()); $this->writeSessionVar('Config.rand', rand());
$this->writeSessionVar("Config.ip", $this->ip); $this->writeSessionVar("Config.ip", $this->ip);
$this->writeSessionVar("Config.userAgent", $this->userAgent); $this->writeSessionVar("Config.userAgent", $this->userAgent);
$this->valid = true; $this->valid = true;
} }
} }
else else
{ {
if(!$this->readSessionVar("Config")) if(!$this->readSessionVar("Config"))
{ {
srand((double)microtime() * 1000000); srand((double)microtime() * 1000000);
$this->writeSessionVar('Config.rand', rand()); $this->writeSessionVar('Config.rand', rand());
$this->writeSessionVar("Config.ip", $this->ip); $this->writeSessionVar("Config.ip", $this->ip);
$this->writeSessionVar("Config.userAgent", $this->userAgent); $this->writeSessionVar("Config.userAgent", $this->userAgent);
} }
$this->valid = true; $this->valid = true;
} }
if($this->security == 'high') if($this->security == 'high')
{ {
@ -486,7 +476,6 @@ class CakeSession extends Object
die(); die();
} }
/** /**
* Enter description here... * Enter description here...
* *
@ -496,27 +485,23 @@ class CakeSession extends Object
*/ */
function _regenerateId() function _regenerateId()
{ {
$oldSessionId = session_id(); $oldSessionId = session_id();
$sessionpath = session_save_path();
if (empty($sessionpath))
{
$sessionpath = "/tmp";
}
if (isset($_COOKIE[session_name()]))
{
setcookie(CAKE_SESSION_COOKIE, '', time()-42000, $this->path);
}
session_regenerate_id(); session_regenerate_id();
$newSessid = session_id(); $newSessid = session_id();
if (function_exists('session_write_close')) $file = $sessionpath.DS."sess_$oldSessionId";
{ @unlink($file);
if($this->security == 'high') $this->_initSession();
{ session_id($newSessid);
if (isset($_COOKIE[session_name()])) session_start();
{
setcookie(CAKE_SESSION_COOKIE, '', time()-42000, $this->path);
}
$sessionpath = session_save_path();
$file = $sessionpath."/sess_$oldSessionId";
@unlink($file);
}
session_write_close();
$this->_initSession();
session_id($newSessid);
session_start();
}
} }
/** /**
@ -539,7 +524,6 @@ class CakeSession extends Object
*/ */
function _sessionVarNames($name) function _sessionVarNames($name)
{ {
if(is_string($name)) if(is_string($name))
{ {
if(strpos($name, ".")) if(strpos($name, "."))
@ -571,7 +555,6 @@ class CakeSession extends Object
*/ */
function _setError($errorNumber, $errorMessage) function _setError($errorNumber, $errorMessage)
{ {
if($this->error === false) if($this->error === false)
{ {
$this->error = array(); $this->error = array();

8
cake/libs/view/templates/scaffolds/show.thtml
View file

@ -7,10 +7,10 @@
* PHP versions 4 and 5 * PHP versions 4 and 5
* *
* CakePHP : Rapid Development Framework <http://www.cakephp.org/> * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
* Copyright (c) 2005, Cake Software Foundation, Inc. * Copyright (c) 2005, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204 * 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104 * Las Vegas, Nevada 89104
* *
* Licensed under The MIT License * Licensed under The MIT License
* Redistributions of files must retain the above copyright notice. * Redistributions of files must retain the above copyright notice.
* *
@ -93,7 +93,7 @@
foreach ($objModel->_oneToOne as $relation) foreach ($objModel->_oneToOne as $relation)
{ {
list($association, $model, $value) = $relation; list($association, $model, $value) = $relation;
$otherModelName = $objModel->tableToModel[$model]; $otherModelName = $objModel->tableToModel[$objModel->{$model}->table];
$controller = Inflector::pluralize($model); $controller = Inflector::pluralize($model);
echo "<div class='related'><H2>Related ".Inflector::humanize($association)."</H2>"; echo "<div class='related'><H2>Related ".Inflector::humanize($association)."</H2>";
@ -113,7 +113,7 @@
} }
echo "</dl>"; echo "</dl>";
echo "<ul class='actions'><li>".$html->linkTo('Edit '.Inflector::humanize($association),"/".Inflector::underscore($controller)."/edit/{$data[$association][$otherModelObject->primaryKey]}")."</li></ul></div>"; echo "<ul class='actions'><li>".$html->linkTo('Edit '.Inflector::humanize($association),"/".Inflector::underscore($controller)."/edit/{$data[$association][$objModel->{$model}->primaryKey]}")."</li></ul></div>";
} }
?> ?>

4
cake/scripts/acl.php
View file

@ -58,6 +58,10 @@ require_once (CONFIGS.'core.php');
require_once (CONFIGS.'database.php'); require_once (CONFIGS.'database.php');
uses ('neat_array'); uses ('neat_array');
uses ('object');
uses ('session');
uses ('security');
uses ('model'.DS.'model');
uses ('model'.DS.'dbo'.DS.'dbo_factory'); uses ('model'.DS.'dbo'.DS.'dbo_factory');
uses ('controller'.DS.'controller'); uses ('controller'.DS.'controller');
uses ('controller'.DS.'components'.DS.'acl'); uses ('controller'.DS.'components'.DS.'acl');