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.
; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
; * @package cake
; * @subpackage cake.cake.app.config
; * @subpackage cake.app.config
; * @since CakePHP v 0.10.0.1076
; * @version $Revision$
; * @modifiedby $LastChangedBy$

2
app/config/bootstrap.php
View file

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

2
app/config/core.php
View file

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

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

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

2
app/config/routes.php
View file

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

2
app/index.php
View file

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

2
app/webroot/css.php
View file

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

18
app/webroot/index.php
View file

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.webroot
* @subpackage cake.app.webroot
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$
@ -66,6 +66,7 @@ if (!defined('CAKE_CORE_INCLUDE_PATH'))
define('CAKE_CORE_INCLUDE_PATH', ROOT);
}
///////////////////////////////
//DO NOT EDIT BELOW THIS LINE//
///////////////////////////////
@ -74,13 +75,22 @@ if (!defined('WEBROOT_DIR'))
{
define ('WEBROOT_DIR', basename(dirname(__FILE__)));
}
define('WWW_ROOT', dirname(__FILE__));
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 'config'.DS.'bootstrap.php';
require CORE_PATH.'cake'.DS.'bootstrap.php';
require APP_PATH.'config'.DS.'bootstrap.php';
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.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.public.js
* @subpackage cake.app.webroot.js
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$

2
cake/app_controller.php
View file

@ -36,7 +36,7 @@
* will inherit them.
*
* @package cake
* @subpackage cake.app
* @subpackage cake.cake
*/
class AppController extends Controller {
}

2
cake/app_model.php
View file

@ -36,7 +36,7 @@
* will inherit them.
*
* @package cake
* @subpackage cake.app
* @subpackage cake.cake
*/
class AppModel extends Model {
}

4
cake/basics.php
View file

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

10
cake/bootstrap.php
View file

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

2
cake/config/paths.php
View file

@ -47,7 +47,7 @@ if(!defined('WEBROOT_DIR'))
/**
* Path to the application's directory.
*/
define ('CAKE', 'cake'.DS);
define ('CAKE', CORE_PATH.'cake'.DS);
/**
* 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.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.webroot
* @subpackage cake.cake.libs
* @since CakePHP v 0.10.3.1612
* @version $Revision$
* @modifiedby $LastChangedBy$
@ -37,7 +37,7 @@ uses('object', 'inflector');
* base class for /scripts/add.php.
*
* @package cake
* @subpackage cake.libs
* @subpackage cake.cake.libs
* @since CakePHP v CakePHP v 0.10.3.1612
*/
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.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.controllers.componenets.dbacl
* @subpackage cake.cake.libs.controller.componenets.dbacl
* @since CakePHP v 0.2.9
* @version $Revision$
* @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.
*
* @package cake
* @subpackage cake.cake.app.controllers.components.dbacl
* @subpackage cake.cake.libs.controller.components.dbacl
*/
class DB_ACL extends AclBase

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

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

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

@ -356,13 +356,13 @@ class Scaffold extends Object {
*/
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
{

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

@ -20,7 +20,7 @@
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.libs.model.datasources.dbo
* @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$
@ -40,7 +40,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
* Database abstraction implementation for the AdoDB library.
*
* @package cake
* @subpackage cake.cake.libs.model.datasources.dbo
* @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9
*/
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.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.libs.model.datasources.dbo
* @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$
@ -37,7 +37,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
* All implementations override this class.
*
* @package cake
* @subpackage cake.cake.libs.model.datasources.dbo
* @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9
*/
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.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.libs.model.datasources.dbo
* @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$
@ -41,7 +41,7 @@ vendor('Pear/DB');
* Long description for class
*
* @package cake
* @subpackage cake.cake.libs.model.datasources.dbo
* @subpackage cake.cake.libs.model.dbo
* @since CakePHP v 0.2.9
*/
class DBO_Pear extends DboSource

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

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

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

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

4
cake/libs/security.php
View file

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

16
cake/libs/session.php
View file

@ -347,7 +347,10 @@ class CakeSession extends Object
{
case 'high':
$this->cookieLifeTime = 0;
if(function_exists('ini_set'))
{
ini_set('session.referer_check', $this->host);
}
break;
case 'medium':
$this->cookieLifeTime = 7 * 86400;
@ -362,6 +365,8 @@ class CakeSession extends Object
{
case 'cake':
if(!isset($_SESSION))
{
if(function_exists('ini_set'))
{
ini_set('session.use_trans_sid', 0);
ini_set('url_rewriter.tags', '');
@ -374,9 +379,12 @@ class CakeSession extends Object
ini_set('session.auto_start', 0);
ini_set('session.save_path', TMP.'sessions');
}
}
break;
case 'database':
if(!isset($_SESSION))
{
if(function_exists('ini_set'))
{
ini_set('session.use_trans_sid', 0);
ini_set('url_rewriter.tags', '');
@ -389,7 +397,7 @@ class CakeSession extends Object
ini_set('session.gc_probability', 1);
ini_set('session.auto_start', 0);
}
}
session_set_save_handler(array('CakeSession', '__open'),
array('CakeSession', '__close'),
array('CakeSession', '__read'),
@ -399,6 +407,8 @@ class CakeSession extends Object
break;
case 'php':
if(!isset($_SESSION))
{
if(function_exists('ini_set'))
{
ini_set('session.use_trans_sid', 0);
ini_set('session.name', CAKE_SESSION_COOKIE);
@ -406,6 +416,7 @@ class CakeSession extends Object
ini_set('session.cookie_path', $this->path);
ini_set('session.gc_probability', 1);
}
}
break;
default:
if(!isset($_SESSION))
@ -419,6 +430,8 @@ class CakeSession extends Object
else
{
if(!isset($_SESSION))
{
if(function_exists('ini_set'))
{
ini_set('session.use_trans_sid', 0);
ini_set('session.name', CAKE_SESSION_COOKIE);
@ -427,6 +440,7 @@ class CakeSession extends Object
ini_set('session.gc_probability', 1);
}
}
}
break;
}
}

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

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

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

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

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

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

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

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

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

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

10
cake/scripts/acl.php
View file

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