diff --git a/VERSION.txt b/VERSION.txt
index 2284a306f..a5b49dc5b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
-0.10.8.2130
\ No newline at end of file
+0.10.8.2134
\ No newline at end of file
diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php
index 67f6a58a3..b454368dd 100644
--- a/app/config/acl.ini.php
+++ b/app/config/acl.ini.php
@@ -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$
diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index 515b9a2ce..7d60c2e54 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -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$
diff --git a/app/config/core.php b/app/config/core.php
index 7cc65df77..74c96f2c9 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -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$
diff --git a/app/config/database.php.default b/app/config/database.php.default
index ed3e2a319..5ac8de78e 100644
--- a/app/config/database.php.default
+++ b/app/config/database.php.default
@@ -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$
diff --git a/app/config/routes.php b/app/config/routes.php
index 2d183b994..52dabb918 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -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$
diff --git a/app/index.php b/app/index.php
index 509639a04..4dc8cfe57 100644
--- a/app/index.php
+++ b/app/index.php
@@ -5,18 +5,18 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @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$
diff --git a/app/webroot/css.php b/app/webroot/css.php
index c8b399e01..a000320ba 100644
--- a/app/webroot/css.php
+++ b/app/webroot/css.php
@@ -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$
diff --git a/app/webroot/index.php b/app/webroot/index.php
index a418b876b..8dce281bb 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -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__));
-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 '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')
{
diff --git a/app/webroot/js/vendors.php b/app/webroot/js/vendors.php
index de705f3d9..4dd8d34c4 100644
--- a/app/webroot/js/vendors.php
+++ b/app/webroot/js/vendors.php
@@ -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$
diff --git a/cake/app_controller.php b/cake/app_controller.php
index f5c1a8d3a..c921d6327 100644
--- a/cake/app_controller.php
+++ b/cake/app_controller.php
@@ -3,21 +3,21 @@
/**
* 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.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
@@ -32,11 +32,11 @@
/**
* 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.
- *
+ *
* @package cake
- * @subpackage cake.app
+ * @subpackage cake.cake
*/
class AppController extends Controller {
}
diff --git a/cake/app_model.php b/cake/app_model.php
index 8ee4252c0..6f550e303 100644
--- a/cake/app_model.php
+++ b/cake/app_model.php
@@ -3,21 +3,21 @@
/**
* 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.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
@@ -28,15 +28,15 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
-
+
/**
* Application model for Cake.
*
* Add your application-wide methods in the class below, your models
* will inherit them.
- *
+ *
* @package cake
- * @subpackage cake.app
+ * @subpackage cake.cake
*/
class AppModel extends Model {
}
diff --git a/cake/basics.php b/cake/basics.php
index 7e811c6de..2b4e10892 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -940,6 +940,10 @@ function fileExistsInPath ($file)
{
return $fullPath;
}
+ elseif (file_exists($file))
+ {
+ return $file;
+ }
}
return false;
}
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index f02631f01..90e1584c6 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -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,7 +95,11 @@ if (strpos($url, 'ccss/') === 0)
if (DEBUG)
{
error_reporting(E_ALL);
- ini_set('display_errors', 1);
+
+ if(function_exists('ini_set'))
+ {
+ ini_set('display_errors', 1);
+ }
}
else
{
diff --git a/cake/config/paths.php b/cake/config/paths.php
index 207982117..f2624185a 100644
--- a/cake/config/paths.php
+++ b/cake/config/paths.php
@@ -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.
diff --git a/cake/libs/bake.php b/cake/libs/bake.php
index 20e74062b..e3a9072c8 100644
--- a/cake/libs/bake.php
+++ b/cake/libs/bake.php
@@ -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
diff --git a/cake/libs/controller/components/dbacl/db_acl.php b/cake/libs/controller/components/dbacl/db_acl.php
index 88a3dc7f2..bc58b9120 100644
--- a/cake/libs/controller/components/dbacl/db_acl.php
+++ b/cake/libs/controller/components/dbacl/db_acl.php
@@ -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
diff --git a/cake/libs/controller/components/iniacl/ini_acl.php b/cake/libs/controller/components/iniacl/ini_acl.php
index 8288fb7ce..89b5d054c 100644
--- a/cake/libs/controller/components/iniacl/ini_acl.php
+++ b/cake/libs/controller/components/iniacl/ini_acl.php
@@ -2,25 +2,25 @@
/* SVN FILE: $Id$ */
/**
- * This is core configuration file.
- *
+ * This is core configuration file.
+ *
* Use it to configure core behaviour ofCake.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
- *
+ *
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @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,10 +34,10 @@ 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
+class INI_ACL extends AclBase
{
/**
* The constructor must be overridden, as AclBase is abstract.
@@ -45,9 +45,9 @@ class INI_ACL extends AclBase
*/
function __construct()
{
-
+
}
-
+
/**
* 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).
@@ -59,7 +59,7 @@ class INI_ACL extends AclBase
function check($aro, $aco, $aco_action = null)
{
$aclConfig = $this->readConfigFile(CONFIGS . 'acl.ini.php');
-
+
//First, if the user is specifically denied, then DENY
if(isset($aclConfig[$aro]['deny']))
{
@@ -70,7 +70,7 @@ class INI_ACL extends AclBase
return false;
}
}
-
+
//Second, if the user is specifically allowed, then ALLOW
if(isset($aclConfig[$aro]['allow']))
{
@@ -81,7 +81,7 @@ class INI_ACL extends AclBase
return true;
}
}
-
+
//Check group permissions
if (isset($aclConfig[$aro]['groups']))
{
@@ -101,7 +101,7 @@ class INI_ACL extends AclBase
return false;
}
}
-
+
//If the group is specifically allowed, then ALLOW
if(isset($aclConfig[$group]['allow']))
{
@@ -115,12 +115,12 @@ class INI_ACL extends AclBase
}
}
}
-
+
//Default, DENY
//echo("DEFAULT: DENY.");
return false;
}
-
+
/**
* 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)
{
$fileLineArray = file($fileName);
-
+
foreach ($fileLineArray as $fileLine)
{
$dataLine = trim($fileLine);
@@ -170,7 +170,7 @@ class INI_ACL extends AclBase
}
return $iniSetting;
}
-
+
/**
* Removes trailing spaces on all array elements (to prepare for searching)
*
@@ -182,7 +182,7 @@ class INI_ACL extends AclBase
foreach($array as $element) {
$element = trim($element);
}
-
+
//Adding this element keeps array_search from returning 0:
//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.
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index 089b9259a..c37d04c06 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -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
{
diff --git a/cake/libs/model/dbo/dbo_adodb.php b/cake/libs/model/dbo/dbo_adodb.php
index ae11db011..503274d77 100644
--- a/cake/libs/model/dbo/dbo_adodb.php
+++ b/cake/libs/model/dbo/dbo_adodb.php
@@ -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
diff --git a/cake/libs/model/dbo/dbo_generic.php b/cake/libs/model/dbo/dbo_generic.php
index b49d8b435..2ef2d6632 100644
--- a/cake/libs/model/dbo/dbo_generic.php
+++ b/cake/libs/model/dbo/dbo_generic.php
@@ -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
diff --git a/cake/libs/model/dbo/dbo_pear.php b/cake/libs/model/dbo/dbo_pear.php
index f4574e84c..163cc7353 100644
--- a/cake/libs/model/dbo/dbo_pear.php
+++ b/cake/libs/model/dbo/dbo_pear.php
@@ -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
diff --git a/cake/libs/model/dbo/dbo_postgres.php b/cake/libs/model/dbo/dbo_postgres.php
index 507c28481..79e49e94d 100644
--- a/cake/libs/model/dbo/dbo_postgres.php
+++ b/cake/libs/model/dbo/dbo_postgres.php
@@ -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
@@ -233,7 +233,7 @@ class DboPostgres extends DboSource
}
}
}
-
+
return $fields;
}
@@ -299,7 +299,7 @@ class DboPostgres extends DboSource
}
$data = pg_escape_string($data);
-
+
$return = "'" . $data . "'";
return $return;
}
@@ -388,7 +388,7 @@ class DboPostgres extends DboSource
}
return null;
}
-
+
function resultSet(&$results)
{
$this->results =& $results;
@@ -400,7 +400,7 @@ class DboPostgres extends DboSource
while ($j < $num_fields)
{
$columnName = pg_field_name($results, $j);
-
+
if (strpos($columnName, '__'))
{
$parts = explode('__', $columnName);
diff --git a/cake/libs/model/dbo/dbo_sqlite.php b/cake/libs/model/dbo/dbo_sqlite.php
index 1a48cc1f2..be80b00d6 100644
--- a/cake/libs/model/dbo/dbo_sqlite.php
+++ b/cake/libs/model/dbo/dbo_sqlite.php
@@ -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
diff --git a/cake/libs/security.php b/cake/libs/security.php
index f12d8a5ee..f204d84e3 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -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
{
diff --git a/cake/libs/session.php b/cake/libs/session.php
index dbb1a834f..5b8312f95 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -347,7 +347,10 @@ class CakeSession extends Object
{
case 'high':
$this->cookieLifeTime = 0;
- ini_set('session.referer_check', $this->host);
+ if(function_exists('ini_set'))
+ {
+ ini_set('session.referer_check', $this->host);
+ }
break;
case 'medium':
$this->cookieLifeTime = 7 * 86400;
@@ -363,33 +366,38 @@ class CakeSession extends Object
case 'cake':
if(!isset($_SESSION))
{
- ini_set('session.use_trans_sid', 0);
- ini_set('url_rewriter.tags', '');
- ini_set('session.serialize_handler', 'php');
- ini_set('session.use_cookies', 1);
- ini_set('session.name', CAKE_SESSION_COOKIE);
- ini_set('session.cookie_lifetime', $this->cookieLifeTime);
- ini_set('session.cookie_path', $this->path);
- ini_set('session.gc_probability', 1);
- ini_set('session.auto_start', 0);
- ini_set('session.save_path', TMP.'sessions');
+ if(function_exists('ini_set'))
+ {
+ ini_set('session.use_trans_sid', 0);
+ ini_set('url_rewriter.tags', '');
+ ini_set('session.serialize_handler', 'php');
+ ini_set('session.use_cookies', 1);
+ ini_set('session.name', CAKE_SESSION_COOKIE);
+ ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+ ini_set('session.cookie_path', $this->path);
+ ini_set('session.gc_probability', 1);
+ ini_set('session.auto_start', 0);
+ ini_set('session.save_path', TMP.'sessions');
+ }
}
break;
case 'database':
if(!isset($_SESSION))
{
- ini_set('session.use_trans_sid', 0);
- ini_set('url_rewriter.tags', '');
- ini_set('session.save_handler', 'user');
- ini_set('session.serialize_handler', 'php');
- ini_set('session.use_cookies', 1);
- ini_set('session.name', CAKE_SESSION_COOKIE);
- ini_set('session.cookie_lifetime', $this->cookieLifeTime);
- ini_set('session.cookie_path', $this->path);
- ini_set('session.gc_probability', 1);
- ini_set('session.auto_start', 0);
+ if(function_exists('ini_set'))
+ {
+ ini_set('session.use_trans_sid', 0);
+ ini_set('url_rewriter.tags', '');
+ ini_set('session.save_handler', 'user');
+ ini_set('session.serialize_handler', 'php');
+ ini_set('session.use_cookies', 1);
+ ini_set('session.name', CAKE_SESSION_COOKIE);
+ ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+ 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'),
array('CakeSession', '__close'),
array('CakeSession', '__read'),
@@ -400,11 +408,14 @@ class CakeSession extends Object
case 'php':
if(!isset($_SESSION))
{
- ini_set('session.use_trans_sid', 0);
- ini_set('session.name', CAKE_SESSION_COOKIE);
- ini_set('session.cookie_lifetime', $this->cookieLifeTime);
- ini_set('session.cookie_path', $this->path);
- ini_set('session.gc_probability', 1);
+ if(function_exists('ini_set'))
+ {
+ ini_set('session.use_trans_sid', 0);
+ ini_set('session.name', CAKE_SESSION_COOKIE);
+ ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+ ini_set('session.cookie_path', $this->path);
+ ini_set('session.gc_probability', 1);
+ }
}
break;
default:
@@ -420,11 +431,14 @@ class CakeSession extends Object
{
if(!isset($_SESSION))
{
- ini_set('session.use_trans_sid', 0);
- ini_set('session.name', CAKE_SESSION_COOKIE);
- ini_set('session.cookie_lifetime', $this->cookieLifeTime);
- ini_set('session.cookie_path', $this->path);
- ini_set('session.gc_probability', 1);
+ if(function_exists('ini_set'))
+ {
+ ini_set('session.use_trans_sid', 0);
+ ini_set('session.name', CAKE_SESSION_COOKIE);
+ ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+ ini_set('session.cookie_path', $this->path);
+ ini_set('session.gc_probability', 1);
+ }
}
}
break;
diff --git a/cake/libs/view/templates/elements/dump.thtml b/cake/libs/view/templates/elements/dump.thtml
index 599edcad9..f0f64b71d 100644
--- a/cake/libs/view/templates/elements/dump.thtml
+++ b/cake/libs/view/templates/elements/dump.thtml
@@ -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$
diff --git a/cake/libs/view/templates/scaffolds/edit.thtml b/cake/libs/view/templates/scaffolds/edit.thtml
index 70242eb4b..15178dae5 100644
--- a/cake/libs/view/templates/scaffolds/edit.thtml
+++ b/cake/libs/view/templates/scaffolds/edit.thtml
@@ -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$
diff --git a/cake/libs/view/templates/scaffolds/list.thtml b/cake/libs/view/templates/scaffolds/list.thtml
index b7854959a..7275e5921 100644
--- a/cake/libs/view/templates/scaffolds/list.thtml
+++ b/cake/libs/view/templates/scaffolds/list.thtml
@@ -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$
diff --git a/cake/libs/view/templates/scaffolds/new.thtml b/cake/libs/view/templates/scaffolds/new.thtml
index 43e243e71..c15203c18 100644
--- a/cake/libs/view/templates/scaffolds/new.thtml
+++ b/cake/libs/view/templates/scaffolds/new.thtml
@@ -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$
diff --git a/cake/libs/view/templates/scaffolds/show.thtml b/cake/libs/view/templates/scaffolds/show.thtml
index f8bc38247..63c43437b 100644
--- a/cake/libs/view/templates/scaffolds/show.thtml
+++ b/cake/libs/view/templates/scaffolds/show.thtml
@@ -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$
diff --git a/cake/scripts/acl.php b/cake/scripts/acl.php
index 31298b648..6318ebb98 100644
--- a/cake/scripts/acl.php
+++ b/cake/scripts/acl.php
@@ -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 {
/**