Merging fixes into 1.x.x.x branched code:

Revision: [2955] Revision: [2951] Revision: [2918] Revision: [2911] git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
belmasnaoui · May 26, 2006 · e5c074a · e5c074a
1 parent 1dc168a
commit e5c074a
Show file tree

Hide file tree

Showing 131 changed files with 17,924 additions and 21,422 deletions.
diff --git a/.htaccess b/.htaccess
@@ -1,5 +1,5 @@
 <IfModule mod_rewrite.c>
-    RewriteEngine on
-    RewriteRule    ^$ app/webroot/    [L]
-    RewriteRule    (.*) app/webroot/$1 [L]
+   RewriteEngine on
+   RewriteRule    ^$ app/webroot/    [L]
+   RewriteRule    (.*) app/webroot/$1 [L]
 </IfModule>
diff --git a/VERSION.txt b/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.1.2.2887
+1.1.2.2955
diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php
@@ -7,23 +7,23 @@
 ; * PHP versions 4 and 5
 ; *
 ; * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
-; * Copyright (c) 2006, Cake Software Foundation, Inc.
-; *                     1785 E. Sahara Avenue, Suite 490-204
-; *                     Las Vegas, Nevada 89104
+; * 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
-; * @copyright    Copyright (c) 2006, Cake Software Foundation, Inc.
-; * @link         http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
-; * @package      cake
-; * @subpackage   cake.app.config
-; * @since        CakePHP v 0.10.0.1076
-; * @version      $Revision$
-; * @modifiedby   $LastChangedBy$
-; * @lastmodified $Date$
-; * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
+; * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
+; * @link			http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+; * @package		cake
+; * @subpackage	cake.app.config
+; * @since			CakePHP v 0.10.0.1076
+; * @version		$Revision$
+; * @modifiedby	$LastChangedBy$
+; * @lastmodified	$Date$
+; * @license		http://www.opensource.org/licenses/mit-license.php The MIT License
 ; */
 
 ; acl.ini.php - Cake ACL Configuration

diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
@@ -1,6 +1,5 @@
 <?php
 /* SVN FILE: $Id$ */
-
 /**
  * Short description for file.
  *
@@ -9,42 +8,39 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2006, Cake Software Foundation, Inc.
- *                     1785 E. Sahara Avenue, Suite 490-204
- *                     Las Vegas, Nevada 89104
+ * 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
- * @copyright    Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link         http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package      cake
- * @subpackage   cake.app.config
- * @since        CakePHP v 0.10.8.2117
- * @version      $Revision$
- * @modifiedby   $LastChangedBy$
- * @lastmodified $Date$
- * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
+ * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package			cake
+ * @subpackage		cake.app.config
+ * @since			CakePHP v 0.10.8.2117
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
+ * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-
 /**
  *
  * This file is loaded automatically by the app/webroot/index.php file after the core bootstrap.php is loaded
  * This is an application wide file to load any function that is not used within a class define.
  * You can also use this to include or require any files in your application.
  *
  */
-
 /**
  * The settings below can be used to set additional paths to models, views and controllers.
  * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)
  *
  * $modelPaths = array('full path to models', 'second full path to models', 'etc...');
- * $viewPaths  = array('this path to views', 'second full path to views', 'etc...');
- * $controllerPaths  = array('this path to controllers', 'second full path to controllers', 'etc...');
+ * $viewPaths = array('this path to views', 'second full path to views', 'etc...');
+ * $controllerPaths = array('this path to controllers', 'second full path to controllers', 'etc...');
  *
  */
-
 //EOF
 ?>
diff --git a/app/config/core.php b/app/config/core.php
@@ -1,6 +1,5 @@
 <?php
 /* SVN FILE: $Id$ */
-
 /**
  * This is core configuration file.
  *
@@ -9,25 +8,24 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2006, Cake Software Foundation, Inc.
- *                     1785 E. Sahara Avenue, Suite 490-204
- *                     Las Vegas, Nevada 89104
+ * 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
- * @copyright    Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link         http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package      cake
- * @subpackage   cake.app.config
- * @since        CakePHP v 0.2.9
- * @version      $Revision$
- * @modifiedby   $LastChangedBy$
- * @lastmodified $Date$
- * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-
+ * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
+ * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package			cake
+ * @subpackage		cake.app.config
+ * @since			CakePHP v 0.2.9
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
+ * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
 /**
  * If you do not have mod rewrite on your system
  * or if you prefer to use CakePHP pretty urls.
@@ -39,8 +37,7 @@
  * release/app/.htaccess
  * release/app/webroot/.htaccess
  */
-//define ('BASE_URL', env('SCRIPT_NAME'));
-
+//	define ('BASE_URL', env('SCRIPT_NAME'));
 /**
  * Set debug level here:
  * - 0: production
@@ -52,19 +49,19 @@
  * With the other debug levels you get to click the "flash message" to continue.
  *
  */
-define('DEBUG', 1);
+	define('DEBUG', 1);
 /**
  * Turn of caching checking wide.
  * You must still use the controller var cacheAction inside you controller class.
  * You can either set it controller wide, or in each controller method.
  * use var $cacheAction = true; or in the controller method $this->cacheAction = true;
  */
-define ('CACHE_CHECK', false);
+	define('CACHE_CHECK', false);
 /**
  * Error constant. Used for differentiating error logging and debugging.
  * Currently PHP supports LOG_DEBUG
  */
-define ('LOG_ERROR', 2);
+	define('LOG_ERROR', 2);
 /**
  * CakePHP includes 3 types of session saves
  * database or file. Set this to your preferred method.
@@ -78,24 +75,29 @@
  *
  *
  */
-define('CAKE_SESSION_SAVE', 'php');
+	define('CAKE_SESSION_SAVE', 'php');
+/**
+ * If using you own table name for storing sessions
+ * set the table name here.
+ * DO NOT INCLUDE PREFIX IF YOU HAVE SET ONE IN database.php
+ *
+ */
+	define('CAKE_SESSION_TABLE', 'cake_sessions');
 /**
  * Set a random string of used in session.
  *
  */
-define('CAKE_SESSION_STRING', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
+	define('CAKE_SESSION_STRING', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
 /**
  * Set the name of session cookie
  *
  */
-define('CAKE_SESSION_COOKIE', 'CAKEPHP');
-
+	define('CAKE_SESSION_COOKIE', 'CAKEPHP');
 /**
  * Set level of Cake security.
  *
  */
-define('CAKE_SECURITY', 'high');
-
+	define('CAKE_SECURITY', 'high');
 /**
  * Set Cake Session time out.
  * If CAKE_SECURITY define is set
@@ -105,49 +107,41 @@
  *
  *  Number below is seconds.
  */
-define('CAKE_SESSION_TIMEOUT', '120');
-
+	define('CAKE_SESSION_TIMEOUT', '120');
 /**
  * Uncomment the define below to use cake built in admin routes.
  * You can set this value to anything you want.
  * All methods related to the admin route should be prefixed with the
  * name you set CAKE_ADMIN to.
  * For example: admin_index, admin_edit
  */
-//define('CAKE_ADMIN', 'admin');
-
+//	define('CAKE_ADMIN', 'admin');
 /**
  *  The define below is used to turn cake built webservices
  *  on or off. Default setting is off.
  */
-define('WEBSERVICES', 'off');
-
+	define('WEBSERVICES', 'off');
 /**
  * Compress output CSS (removing comments, whitespace, repeating tags etc.)
  * This requires a/var/cache directory to be writable by the web server (caching).
  * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use Controller::cssTag().
  */
-define('COMPRESS_CSS', false);
-
+	define('COMPRESS_CSS', false);
 /**
  * If set to true, helpers would output data instead of returning it.
  */
-define('AUTO_OUTPUT', false);
-
+	define('AUTO_OUTPUT', false);
 /**
  * If set to false, session would not automatically be started.
  */
-define('AUTO_SESSION', true);
-
+	define('AUTO_SESSION', true);
 /**
  * Set the max size of file to use md5() .
  */
-define('MAX_MD5SIZE', (5*1024)*1024 );
-
+	define('MAX_MD5SIZE', (5 * 1024) * 1024);
 /**
  * To use Access Control Lists with Cake...
  */
-define('ACL_CLASSNAME',  'DB_ACL');
-define('ACL_FILENAME',    'dbacl'.DS.'db_acl');
-
+	define('ACL_CLASSNAME', 'DB_ACL');
+	define('ACL_FILENAME', 'dbacl' . DS . 'db_acl');
 ?>
diff --git a/app/config/database.php.default b/app/config/database.php.default
@@ -1,6 +1,5 @@
 <?php
 /* SVN FILE: $Id$ */
-
 /**
  * This is core configuration file.
  *
@@ -9,33 +8,30 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2006, Cake Software Foundation, Inc.
- *                     1785 E. Sahara Avenue, Suite 490-204
- *                     Las Vegas, Nevada 89104
+ * 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
- * @copyright    Copyright (c) 2006, Cake Software Foundation, Inc.
- * @link         http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package      cake
- * @subpackage   cake.app.config
- * @since        CakePHP v 0.2.9
- * @version      $Revision$
- * @modifiedby   $LastChangedBy$
- * @lastmodified $Date$
- * @license      http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
+ * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package			cake
+ * @subpackage		cake.app.config
+ * @since			CakePHP v 0.2.9
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
+ * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-
 /**
  * In this file you set up your database connection details.
  *
- * @package cake
- * @subpackage cake.config
+ * @package		cake
+ * @subpackage	cake.config
  */
-
-
 /**
  * Database configuration class.
  * You can specify multiple configurations for production, development and testing.
@@ -48,8 +44,8 @@
  * PostgreSQL set the connect to either pg_pconnect of pg_connect
  * SQLite set the connect to sqlite_popen  sqlite_open
  * ADOdb set the connect to one of these
- *    (http://phplens.com/adodb/supported.databases.html) and
- *    append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
+ *	(http://phplens.com/adodb/supported.databases.html) and
+ *	append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
  *
  * host =>
  * the host you connect to the database
@@ -59,21 +55,20 @@
  */
 class DATABASE_CONFIG
 {
-    var $default = array('driver'    => 'mysql',
-                         'connect'  => 'mysql_connect',
-                         'host'     => 'localhost',
-                         'login'    => 'user',
-                         'password' => 'password',
-                         'database' => 'project_name',
-                         'prefix'    => '');
+	var $default = array('driver' => 'mysql',
+								'connect' => 'mysql_connect',
+								'host' => 'localhost',
+								'login' => 'user',
+								'password' => 'password',
+								'database' => 'project_name',
+								'prefix' => '');
 
-    var $test    =  array('driver'    => 'mysql',
-                         'connect'  => 'mysql_connect',
-                         'host'     => 'localhost',
-                         'login'    => 'user',
-                         'password' => 'password',
-                         'database' => 'project_name-test',
-                         'prefix'    => '');
+	var $test = array('driver' => 'mysql',
+							'connect' => 'mysql_connect',
+							'host' => 'localhost',
+							'login' => 'user',
+							'password' => 'password',
+							'database' => 'project_name-test',
+							'prefix' => '');
 }
-
 ?>