adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging fixes and enhancements into trunk.

Browse source 
Revision: [2133]
Fixing sub package doc tag

Revision: [2132]
Added fixes when ini_set() is disabled.                   
Problem reported here:
    http://groups.google.com/group/cake-php/browse_thread/thread/f8e537b165da733e/06888a4112345f59

Revision: [2131]
"Correcting subpackage doc block tags "

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2134 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-02-25 19:20:18 +00:00
parent 80d6673717
commit f37dfb6302
32 changed files with 156 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ // // +---------------------------------------------------------------------------------------------------+ //
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
0.10.8.2130 0.10.8.2134

2
app/config/acl.ini.php
View file

@ -18,7 +18,7 @@
; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. ; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project ; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
; * @package cake ; * @package cake
; * @subpackage cake.cake.app.config ; * @subpackage cake.app.config
; * @since CakePHP v 0.10.0.1076 ; * @since CakePHP v 0.10.0.1076
; * @version $Revision$ ; * @version $Revision$
; * @modifiedby $LastChangedBy$ ; * @modifiedby $LastChangedBy$

2
app/config/bootstrap.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.webroot * @subpackage cake.app.config
* @since CakePHP v 0.10.8.2117 * @since CakePHP v 0.10.8.2117
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
app/config/core.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.config * @subpackage cake.app.config
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
app/config/database.php.default
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.config * @subpackage cake.app.config
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
app/config/routes.php
View file

@ -22,7 +22,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.config * @subpackage cake.app.config
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

6
app/index.php
View file

@ -5,18 +5,18 @@
* 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) 2006, Cake Software Foundation, Inc. * Copyright (c) 2006, 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.
* *
* @filesource * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app * @subpackage cake.app
* @since CakePHP v 0.10.0.1076 * @since CakePHP v 0.10.0.1076
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
app/webroot/css.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.webroot * @subpackage cake.app.webroot
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

20
app/webroot/index.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.webroot * @subpackage cake.app.webroot
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -66,6 +66,7 @@ if (!defined('CAKE_CORE_INCLUDE_PATH'))
define('CAKE_CORE_INCLUDE_PATH', ROOT); define('CAKE_CORE_INCLUDE_PATH', ROOT);
} }
/////////////////////////////// ///////////////////////////////
//DO NOT EDIT BELOW THIS LINE// //DO NOT EDIT BELOW THIS LINE//
/////////////////////////////// ///////////////////////////////
@ -74,13 +75,22 @@ if (!defined('WEBROOT_DIR'))
{ {
define ('WEBROOT_DIR', basename(dirname(__FILE__))); define ('WEBROOT_DIR', basename(dirname(__FILE__)));
} }
define('WWW_ROOT', dirname(__FILE__)); define('WWW_ROOT', dirname(__FILE__));
ini_set('include_path',ini_get('include_path').PATH_SEPARATOR.CAKE_CORE_INCLUDE_PATH.PATH_SEPARATOR.ROOT.DS.APP_DIR.DS); if(function_exists('ini_set'))
{
ini_set('include_path',ini_get('include_path').PATH_SEPARATOR.CAKE_CORE_INCLUDE_PATH.PATH_SEPARATOR.ROOT.DS.APP_DIR.DS);
define('APP_PATH', null);
define('CORE_PATH', null);
}
else
{
define('APP_PATH', ROOT.DS.APP_DIR.DS);
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH.DS);
}
require 'cake'.DS.'bootstrap.php'; require CORE_PATH.'cake'.DS.'bootstrap.php';
require 'config'.DS.'bootstrap.php'; require APP_PATH.'config'.DS.'bootstrap.php';
if(isset($_GET['url']) && $_GET['url'] === 'favicon.ico') if(isset($_GET['url']) && $_GET['url'] === 'favicon.ico')
{ {

2
app/webroot/js/vendors.php
View file

@ -21,7 +21,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.public.js * @subpackage cake.app.webroot.js
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

14
cake/app_controller.php
View file

@ -3,21 +3,21 @@
/** /**
* Short description for file. * Short description for file.
* *
* This file is application-wide controller file. You can put all * This file is application-wide controller file. You can put all
* application-wide controller-related methods here. * application-wide controller-related methods here.
* *
* 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) 2006, Cake Software Foundation, Inc. * Copyright (c) 2006, 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.
* *
* @filesource * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
@ -32,11 +32,11 @@
/** /**
* Short description for class. * Short description for class.
* *
* Add your application-wide methods in the class below, your controllers * Add your application-wide methods in the class below, your controllers
* will inherit them. * will inherit them.
* *
* @package cake * @package cake
* @subpackage cake.app * @subpackage cake.cake
*/ */
class AppController extends Controller { class AppController extends Controller {
} }

14
cake/app_model.php
View file

@ -3,21 +3,21 @@
/** /**
* Application model for Cake. * Application model for Cake.
* *
* This file is application-wide model file. You can put all * This file is application-wide model file. You can put all
* application-wide model-related methods here. * application-wide model-related methods here.
* *
* 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) 2006, Cake Software Foundation, Inc. * Copyright (c) 2006, 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.
* *
* @filesource * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
@ -28,15 +28,15 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/ */
/** /**
* Application model for Cake. * Application model for Cake.
* *
* Add your application-wide methods in the class below, your models * Add your application-wide methods in the class below, your models
* will inherit them. * will inherit them.
* *
* @package cake * @package cake
* @subpackage cake.app * @subpackage cake.cake
*/ */
class AppModel extends Model { class AppModel extends Model {
} }

4
cake/basics.php
View file

@ -940,6 +940,10 @@ function fileExistsInPath ($file)
{ {
return $fullPath; return $fullPath;
} }
elseif (file_exists($file))
{
return $file;
}
} }
return false; return false;
} }

12
cake/bootstrap.php
View file

@ -35,9 +35,9 @@
*/ */
if(!isset($bootstrap)) if(!isset($bootstrap))
{ {
require 'cake'.DS.'basics.php'; require CORE_PATH.'cake'.DS.'basics.php';
require 'config'.DS.'core.php'; require APP_PATH.'config'.DS.'core.php';
require 'cake'.DS.'config'.DS.'paths.php'; require CORE_PATH.'cake'.DS.'config'.DS.'paths.php';
} }
require LIBS.'object.php'; require LIBS.'object.php';
require LIBS.'session.php'; require LIBS.'session.php';
@ -95,7 +95,11 @@ if (strpos($url, 'ccss/') === 0)
if (DEBUG) if (DEBUG)
{ {
error_reporting(E_ALL); error_reporting(E_ALL);
ini_set('display_errors', 1);
if(function_exists('ini_set'))
{
ini_set('display_errors', 1);
}
} }
else else
{ {

2
cake/config/paths.php
View file

@ -47,7 +47,7 @@ if(!defined('WEBROOT_DIR'))
/** /**
* Path to the application's directory. * Path to the application's directory.
*/ */
define ('CAKE', 'cake'.DS); define ('CAKE', CORE_PATH.'cake'.DS);
/** /**
* Path to the application's directory. * Path to the application's directory.

4
cake/libs/bake.php
View file

@ -19,7 +19,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.webroot * @subpackage cake.cake.libs
* @since CakePHP v 0.10.3.1612 * @since CakePHP v 0.10.3.1612
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -37,7 +37,7 @@ uses('object', 'inflector');
* base class for /scripts/add.php. * base class for /scripts/add.php.
* *
* @package cake * @package cake
* @subpackage cake.libs * @subpackage cake.cake.libs
* @since CakePHP v CakePHP v 0.10.3.1612 * @since CakePHP v CakePHP v 0.10.3.1612
*/ */
class Bake extends Object class Bake extends Object

4
cake/libs/controller/components/dbacl/db_acl.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.controllers.componenets.dbacl * @subpackage cake.cake.libs.controller.componenets.dbacl
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -39,7 +39,7 @@ uses('controller'.DS.'components'.DS.'dbacl'.DS.'models'.DS.'aros_aco');
* In this file you can extend the AclBase. * In this file you can extend the AclBase.
* *
* @package cake * @package cake
* @subpackage cake.cake.app.controllers.components.dbacl * @subpackage cake.cake.libs.controller.components.dbacl
*/ */
class DB_ACL extends AclBase class DB_ACL extends AclBase

38
cake/libs/controller/components/iniacl/ini_acl.php
View file

@ -2,25 +2,25 @@
/* SVN FILE: $Id$ */ /* SVN FILE: $Id$ */
/** /**
* This is core configuration file. * This is core configuration file.
* *
* Use it to configure core behaviour ofCake. * Use it to configure core behaviour ofCake.
* *
* 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) 2006, Cake Software Foundation, Inc. * Copyright (c) 2006, 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.
* *
* @filesource * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.app.controllers.componenets * @subpackage cake.cake.libs.controller.componenets.iniacl
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -34,10 +34,10 @@ uses('controller/components/acl_base');
* In this file you can extend the AclBase. * In this file you can extend the AclBase.
* *
* @package cake * @package cake
* @subpackage cake.cake.app.controllers.componenets * @subpackage cake.cake.libs.controller.componenets.iniacl
*/ */
class INI_ACL extends AclBase class INI_ACL extends AclBase
{ {
/** /**
* The constructor must be overridden, as AclBase is abstract. * The constructor must be overridden, as AclBase is abstract.
@ -45,9 +45,9 @@ class INI_ACL extends AclBase
*/ */
function __construct() function __construct()
{ {
} }
/** /**
* Main ACL check function. Checks to see if the ARO (access request object) has access to the ACO (access control object). * Main ACL check function. Checks to see if the ARO (access request object) has access to the ACO (access control object).
* Looks at the acl.ini.php file for permissions (see instructions in/config/acl.ini.php). * Looks at the acl.ini.php file for permissions (see instructions in/config/acl.ini.php).
@ -59,7 +59,7 @@ class INI_ACL extends AclBase
function check($aro, $aco, $aco_action = null) function check($aro, $aco, $aco_action = null)
{ {
$aclConfig = $this->readConfigFile(CONFIGS . 'acl.ini.php'); $aclConfig = $this->readConfigFile(CONFIGS . 'acl.ini.php');
//First, if the user is specifically denied, then DENY //First, if the user is specifically denied, then DENY
if(isset($aclConfig[$aro]['deny'])) if(isset($aclConfig[$aro]['deny']))
{ {
@ -70,7 +70,7 @@ class INI_ACL extends AclBase
return false; return false;
} }
} }
//Second, if the user is specifically allowed, then ALLOW //Second, if the user is specifically allowed, then ALLOW
if(isset($aclConfig[$aro]['allow'])) if(isset($aclConfig[$aro]['allow']))
{ {
@ -81,7 +81,7 @@ class INI_ACL extends AclBase
return true; return true;
} }
} }
//Check group permissions //Check group permissions
if (isset($aclConfig[$aro]['groups'])) if (isset($aclConfig[$aro]['groups']))
{ {
@ -101,7 +101,7 @@ class INI_ACL extends AclBase
return false; return false;
} }
} }
//If the group is specifically allowed, then ALLOW //If the group is specifically allowed, then ALLOW
if(isset($aclConfig[$group]['allow'])) if(isset($aclConfig[$group]['allow']))
{ {
@ -115,12 +115,12 @@ class INI_ACL extends AclBase
} }
} }
} }
//Default, DENY //Default, DENY
//echo("DEFAULT: DENY."); //echo("DEFAULT: DENY.");
return false; return false;
} }
/** /**
* Parses an INI file and returns an array that reflects the INI file's section structure. Double-quote friendly. * Parses an INI file and returns an array that reflects the INI file's section structure. Double-quote friendly.
* *
@ -130,7 +130,7 @@ class INI_ACL extends AclBase
function readConfigFile ($fileName) function readConfigFile ($fileName)
{ {
$fileLineArray = file($fileName); $fileLineArray = file($fileName);
foreach ($fileLineArray as $fileLine) foreach ($fileLineArray as $fileLine)
{ {
$dataLine = trim($fileLine); $dataLine = trim($fileLine);
@ -170,7 +170,7 @@ class INI_ACL extends AclBase
} }
return $iniSetting; return $iniSetting;
} }
/** /**
* Removes trailing spaces on all array elements (to prepare for searching) * Removes trailing spaces on all array elements (to prepare for searching)
* *
@ -182,7 +182,7 @@ class INI_ACL extends AclBase
foreach($array as $element) { foreach($array as $element) {
$element = trim($element); $element = trim($element);
} }
//Adding this element keeps array_search from returning 0: //Adding this element keeps array_search from returning 0:
//0 is the first key, which may be correct, but 0 is interpreted as false. //0 is the first key, which may be correct, but 0 is interpreted as false.
//Adding this element makes all the keys be positive integers. //Adding this element makes all the keys be positive integers.

8
cake/libs/controller/scaffold.php
View file

@ -356,13 +356,13 @@ class Scaffold extends Object {
*/ */
function __scaffoldError() function __scaffoldError()
{ {
if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'new.thtml')) if(file_exists(APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'scaffold.error.thtml'))
{ {
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'scaffold_error.thtml'); return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.$this->viewPath.DS.'scaffolds'.DS.'scaffold.error.thtml');
} }
elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.new.thtml')) elseif(file_exists(APP.'views'.DS.'scaffold'.DS.'scaffold.error.thtml'))
{ {
return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold_error.thtml'); return $this->controllerClass->render($this->actionView, '', APP.'views'.DS.'scaffold'.DS.'scaffold.error.thtml');
} }
else else
{ {

4
cake/libs/model/dbo/dbo_adodb.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -40,7 +40,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
* Database abstraction implementation for the AdoDB library. * Database abstraction implementation for the AdoDB library.
* *
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
*/ */
class DboAdodb extends DboSource class DboAdodb extends DboSource

4
cake/libs/model/dbo/dbo_generic.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -37,7 +37,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
* All implementations override this class. * All implementations override this class.
* *
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
*/ */
class DBO_generic extends DboSource class DBO_generic extends DboSource

4
cake/libs/model/dbo/dbo_pear.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -41,7 +41,7 @@ vendor('Pear/DB');
* Long description for class * Long description for class
* *
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9 * @since CakePHP v 0.2.9
*/ */
class DBO_Pear extends DboSource class DBO_Pear extends DboSource

12
cake/libs/model/dbo/dbo_postgres.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.9.1.114 * @since CakePHP v 0.9.1.114
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -39,7 +39,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
* Long description for class * Long description for class
* *
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.9.1.114 * @since CakePHP v 0.9.1.114
*/ */
class DboPostgres extends DboSource class DboPostgres extends DboSource
@ -233,7 +233,7 @@ class DboPostgres extends DboSource
} }
} }
} }
return $fields; return $fields;
} }
@ -299,7 +299,7 @@ class DboPostgres extends DboSource
} }
$data = pg_escape_string($data); $data = pg_escape_string($data);
$return = "'" . $data . "'"; $return = "'" . $data . "'";
return $return; return $return;
} }
@ -388,7 +388,7 @@ class DboPostgres extends DboSource
} }
return null; return null;
} }
function resultSet(&$results) function resultSet(&$results)
{ {
$this->results =& $results; $this->results =& $results;
@ -400,7 +400,7 @@ class DboPostgres extends DboSource
while ($j < $num_fields) while ($j < $num_fields)
{ {
$columnName = pg_field_name($results, $j); $columnName = pg_field_name($results, $j);
if (strpos($columnName, '__')) if (strpos($columnName, '__'))
{ {
$parts = explode('__', $columnName); $parts = explode('__', $columnName);

4
cake/libs/model/dbo/dbo_sqlite.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.9.0 * @since CakePHP v 0.9.0
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -39,7 +39,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
* Long description for class * Long description for class
* *
* @package cake * @package cake
* @subpackage cake.cake.libs.model.datasources.dbo * @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.9.0 * @since CakePHP v 0.9.0
*/ */
class DBO_SQLite extends DboSource class DBO_SQLite extends DboSource

4
cake/libs/security.php
View file

@ -34,8 +34,8 @@
* Long description for file * Long description for file
* *
* @package cake * @package cake
* @subpackage cake.cake.1233 * @subpackage cake.cake.libs
* @since CakePHP v .0.10.0.1222 * @since CakePHP v .0.10.0.1233
*/ */
class Security extends Object class Security extends Object
{ {

78
cake/libs/session.php
View file

@ -347,7 +347,10 @@ class CakeSession extends Object
{ {
case 'high': case 'high':
$this->cookieLifeTime = 0; $this->cookieLifeTime = 0;
ini_set('session.referer_check', $this->host); if(function_exists('ini_set'))
{
ini_set('session.referer_check', $this->host);
}
break; break;
case 'medium': case 'medium':
$this->cookieLifeTime = 7 * 86400; $this->cookieLifeTime = 7 * 86400;
@ -363,33 +366,38 @@ class CakeSession extends Object
case 'cake': case 'cake':
if(!isset($_SESSION)) if(!isset($_SESSION))
{ {
ini_set('session.use_trans_sid', 0); if(function_exists('ini_set'))
ini_set('url_rewriter.tags', ''); {
ini_set('session.serialize_handler', 'php'); ini_set('session.use_trans_sid', 0);
ini_set('session.use_cookies', 1); ini_set('url_rewriter.tags', '');
ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.serialize_handler', 'php');
ini_set('session.cookie_lifetime', $this->cookieLifeTime); ini_set('session.use_cookies', 1);
ini_set('session.cookie_path', $this->path); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.gc_probability', 1); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.auto_start', 0); ini_set('session.cookie_path', $this->path);
ini_set('session.save_path', TMP.'sessions'); ini_set('session.gc_probability', 1);
ini_set('session.auto_start', 0);
ini_set('session.save_path', TMP.'sessions');
}
} }
break; break;
case 'database': case 'database':
if(!isset($_SESSION)) if(!isset($_SESSION))
{ {
ini_set('session.use_trans_sid', 0); if(function_exists('ini_set'))
ini_set('url_rewriter.tags', ''); {
ini_set('session.save_handler', 'user'); ini_set('session.use_trans_sid', 0);
ini_set('session.serialize_handler', 'php'); ini_set('url_rewriter.tags', '');
ini_set('session.use_cookies', 1); ini_set('session.save_handler', 'user');
ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.serialize_handler', 'php');
ini_set('session.cookie_lifetime', $this->cookieLifeTime); ini_set('session.use_cookies', 1);
ini_set('session.cookie_path', $this->path); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.gc_probability', 1); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.auto_start', 0); ini_set('session.cookie_path', $this->path);
ini_set('session.gc_probability', 1);
ini_set('session.auto_start', 0);
}
} }
session_set_save_handler(array('CakeSession', '__open'), session_set_save_handler(array('CakeSession', '__open'),
array('CakeSession', '__close'), array('CakeSession', '__close'),
array('CakeSession', '__read'), array('CakeSession', '__read'),
@ -400,11 +408,14 @@ class CakeSession extends Object
case 'php': case 'php':
if(!isset($_SESSION)) if(!isset($_SESSION))
{ {
ini_set('session.use_trans_sid', 0); if(function_exists('ini_set'))
ini_set('session.name', CAKE_SESSION_COOKIE); {
ini_set('session.cookie_lifetime', $this->cookieLifeTime); ini_set('session.use_trans_sid', 0);
ini_set('session.cookie_path', $this->path); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.gc_probability', 1); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.cookie_path', $this->path);
ini_set('session.gc_probability', 1);
}
} }
break; break;
default: default:
@ -420,11 +431,14 @@ class CakeSession extends Object
{ {
if(!isset($_SESSION)) if(!isset($_SESSION))
{ {
ini_set('session.use_trans_sid', 0); if(function_exists('ini_set'))
ini_set('session.name', CAKE_SESSION_COOKIE); {
ini_set('session.cookie_lifetime', $this->cookieLifeTime); ini_set('session.use_trans_sid', 0);
ini_set('session.cookie_path', $this->path); ini_set('session.name', CAKE_SESSION_COOKIE);
ini_set('session.gc_probability', 1); ini_set('session.cookie_lifetime', $this->cookieLifeTime);
ini_set('session.cookie_path', $this->path);
ini_set('session.gc_probability', 1);
}
} }
} }
break; break;

2
cake/libs/view/templates/elements/dump.thtml
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.view.templates.pages * @subpackage cake.cake.libs.view.templates.elements
* @since CakePHP v 0.10.5.1782 * @since CakePHP v 0.10.5.1782
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
cake/libs/view/templates/scaffolds/edit.thtml
View file

@ -18,7 +18,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.templates.scaffolds * @subpackage cake.cake.libs.view.templates.scaffolds
* @since CakePHP v 0.10.0.1076 * @since CakePHP v 0.10.0.1076
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
cake/libs/view/templates/scaffolds/list.thtml
View file

@ -18,7 +18,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.templates.scaffolds * @subpackage cake.cake.libs.view.templates.scaffolds
* @since CakePHP v 0.10.0.1076 * @since CakePHP v 0.10.0.1076
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

2
cake/libs/view/templates/scaffolds/new.thtml
View file

@ -18,7 +18,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.templates.scaffolds * @subpackage cake.cake.libs.view.templates.scaffolds
* @since CakePHP v 0.10.0.1076 * @since CakePHP v 0.10.0.1076
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

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

@ -18,7 +18,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.templates.scaffolds * @subpackage cake.cake.libs.view.templates.scaffolds
* @since CakePHP v 0.10.0.1076 * @since CakePHP v 0.10.0.1076
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$

10
cake/scripts/acl.php
View file

@ -21,7 +21,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.components.dbacl.models * @subpackage cake.cake.scripts
* @since CakePHP v 0.10.0.1232 * @since CakePHP v 0.10.0.1232
* @version $Revision$ * @version $Revision$
* @modifiedby $LastChangedBy$ * @modifiedby $LastChangedBy$
@ -71,6 +71,14 @@ $args = $serverArgs;
$aclCLI = new AclCLI ($command, $args); $aclCLI = new AclCLI ($command, $args);
/**
* Enter description here...
*
* @package cake
* @subpackage cake.cake.scripts
* @since CakePHP v 0.10.0.1232
*/
class AclCLI { class AclCLI {
/** /**