Permalink
Browse files

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
  • Loading branch information...
1 parent 1dc168a commit e5c074a0dc19570d7695c322ca89efbeb8e87215 @phpnut phpnut committed May 26, 2006
Showing with 17,924 additions and 21,422 deletions.
  1. +3 −3 .htaccess
  2. +1 −1 VERSION.txt
  3. +12 −12 app/config/acl.ini.php
  4. +14 −18 app/config/bootstrap.php
  5. +37 −43 app/config/core.php
  6. +30 −35 app/config/database.php.default
  7. +19 −21 app/config/inflections.php
  8. +16 −21 app/config/routes.php
  9. +4 −4 app/config/sql/sessions.sql
  10. +13 −14 app/index.php
  11. +67 −82 app/webroot/css.php
  12. +72 −68 app/webroot/css/cake.basic.css
  13. +1 −1 app/webroot/css/cake.forms.css
  14. +54 −81 app/webroot/index.php
  15. +15 −19 app/webroot/js/vendors.php
  16. +16 −18 cake/app_controller.php
  17. +18 −20 cake/app_model.php
  18. +647 −924 cake/basics.php
  19. +88 −120 cake/bootstrap.php
  20. +58 −96 cake/config/paths.php
  21. +19 −16 cake/config/tags.ini.php
  22. +347 −429 cake/dispatcher.php
  23. +3 −3 cake/docs/COPYING.txt
  24. +3 −3 cake/docs/LICENSE.txt
  25. +2 −2 cake/docs/README.txt
  26. +55 −77 cake/libs/cache.php
  27. +24 −33 cake/libs/cake_log.php
  28. +49 −69 cake/libs/class_registry.php
  29. +64 −87 cake/libs/configure.php
  30. +91 −114 cake/libs/controller/component.php
  31. +55 −76 cake/libs/controller/components/acl.php
  32. +27 −31 cake/libs/controller/components/acl_base.php
  33. +201 −238 cake/libs/controller/components/dbacl/db_acl.php
  34. +182 −249 cake/libs/controller/components/dbacl/models/aclnode.php
  35. +17 −21 cake/libs/controller/components/dbacl/models/aco.php
  36. +18 −22 cake/libs/controller/components/dbacl/models/acoaction.php
  37. +17 −21 cake/libs/controller/components/dbacl/models/aro.php
  38. +18 −22 cake/libs/controller/components/dbacl/models/aros_aco.php
  39. +121 −141 cake/libs/controller/components/iniacl/ini_acl.php
  40. +206 −257 cake/libs/controller/components/request_handler.php
  41. +122 −125 cake/libs/controller/components/security.php
  42. +70 −92 cake/libs/controller/components/session.php
  43. +573 −749 cake/libs/controller/controller.php
  44. +45 −51 cake/libs/controller/pages_controller.php
  45. +317 −350 cake/libs/controller/scaffold.php
  46. +235 −275 cake/libs/error.php
  47. +150 −208 cake/libs/file.php
  48. +195 −283 cake/libs/flay.php
  49. +191 −293 cake/libs/folder.php
  50. +228 −248 cake/libs/inflector.php
  51. +42 −58 cake/libs/legacy.php
  52. +105 −124 cake/libs/model/connection_manager.php
  53. +196 −298 cake/libs/model/datasources/datasource.php
  54. +1,121 −1,422 cake/libs/model/datasources/dbo_source.php
  55. +176 −203 cake/libs/model/dbo/dbo_adodb.php
  56. +48 −57 cake/libs/model/dbo/dbo_generic.php
  57. +353 −420 cake/libs/model/dbo/dbo_mssql.php
  58. +290 −375 cake/libs/model/dbo/dbo_mysql.php
  59. +293 −306 cake/libs/model/dbo/dbo_odbc.php
  60. +103 −133 cake/libs/model/dbo/dbo_pear.php
  61. +364 −440 cake/libs/model/dbo/dbo_postgres.php
  62. +323 −324 cake/libs/model/dbo/dbo_sqlite.php
  63. +20 −24 cake/libs/model/model.php
  64. +962 −1,107 cake/libs/model/model_php4.php
  65. +960 −1,105 cake/libs/model/model_php5.php
  66. +169 −236 cake/libs/neat_array.php
  67. +40 −55 cake/libs/neat_string.php
  68. +130 −176 cake/libs/object.php
  69. +150 −203 cake/libs/router.php
  70. +165 −227 cake/libs/sanitize.php
  71. +117 −110 cake/libs/security.php
  72. +347 −432 cake/libs/session.php
  73. +19 −25 cake/libs/validators.php
  74. +80 −95 cake/libs/view/helper.php
  75. +496 −483 cake/libs/view/helpers/ajax.php
  76. +166 −180 cake/libs/view/helpers/cache.php
  77. +358 −340 cake/libs/view/helpers/form.php
  78. +844 −1,185 cake/libs/view/helpers/html.php
  79. +156 −180 cake/libs/view/helpers/javascript.php
  80. +40 −41 cake/libs/view/helpers/number.php
  81. +123 −142 cake/libs/view/helpers/text.php
  82. +271 −327 cake/libs/view/helpers/time.php
  83. +16 −16 cake/libs/view/templates/elements/dump.thtml
  84. +12 −12 cake/libs/view/templates/errors/error404.thtml
  85. +12 −12 cake/libs/view/templates/errors/missing_action.thtml
  86. +12 −12 cake/libs/view/templates/errors/missing_component_class.thtml
  87. +12 −12 cake/libs/view/templates/errors/missing_component_file.thtml
  88. +12 −12 cake/libs/view/templates/errors/missing_connection.thtml
  89. +12 −12 cake/libs/view/templates/errors/missing_controller.thtml
  90. +12 −12 cake/libs/view/templates/errors/missing_helper_class.thtml
  91. +12 −12 cake/libs/view/templates/errors/missing_helper_file.thtml
  92. +12 −12 cake/libs/view/templates/errors/missing_layout.thtml
  93. +12 −12 cake/libs/view/templates/errors/missing_model.thtml
  94. +12 −12 cake/libs/view/templates/errors/missing_scaffolddb.thtml
  95. +12 −12 cake/libs/view/templates/errors/missing_table.thtml
  96. +12 −12 cake/libs/view/templates/errors/missing_view.thtml
  97. +12 −12 cake/libs/view/templates/errors/private_action.thtml
  98. +12 −12 cake/libs/view/templates/errors/scaffold_error.thtml
  99. +12 −12 cake/libs/view/templates/layouts/ajax.thtml
  100. +52 −52 cake/libs/view/templates/layouts/default.thtml
  101. +12 −12 cake/libs/view/templates/layouts/flash.thtml
  102. +32 −32 cake/libs/view/templates/pages/home.thtml
  103. +24 −24 cake/libs/view/templates/scaffolds/edit.thtml
  104. +65 −65 cake/libs/view/templates/scaffolds/list.thtml
  105. +14 −14 cake/libs/view/templates/scaffolds/new.thtml
  106. +132 −132 cake/libs/view/templates/scaffolds/show.thtml
  107. +481 −589 cake/libs/view/view.php
  108. +378 −481 cake/scripts/acl.php
  109. +2,083 −2,302 cake/scripts/bake.php
  110. +3 −3 cake/scripts/templates/skel/.htaccess
  111. +41 −0 cake/scripts/templates/skel/app_controller.php
  112. +43 −0 cake/scripts/templates/skel/app_model.php
  113. +12 −12 cake/scripts/templates/skel/config/acl.ini.php
  114. +14 −18 cake/scripts/templates/skel/config/bootstrap.php
  115. +28 −41 cake/scripts/templates/skel/config/core.php
  116. +29 −34 cake/scripts/templates/skel/config/database.php.default
  117. +13 −15 cake/scripts/templates/skel/config/inflections.php
  118. +13 −18 cake/scripts/templates/skel/config/routes.php
  119. +4 −4 cake/scripts/templates/skel/config/sql/sessions.sql
  120. +105 −0 cake/scripts/templates/skel/controllers/pages_controller.php
  121. +13 −14 cake/scripts/templates/skel/index.php
  122. +12 −12 cake/scripts/templates/skel/views/layouts/ajax.thtml
  123. +21 −20 cake/scripts/templates/skel/views/layouts/default.thtml
  124. +12 −12 cake/scripts/templates/skel/views/layouts/flash.thtml
  125. +4 −4 cake/scripts/templates/skel/webroot/.htaccess
  126. +65 −82 cake/scripts/templates/skel/webroot/css.php
  127. +35 −35 cake/scripts/templates/skel/webroot/css/generic.basic.css
  128. +1 −1 cake/scripts/templates/skel/webroot/css/generic.forms.css
  129. +54 −80 cake/scripts/templates/skel/webroot/index.php
  130. +15 −19 cake/scripts/templates/skel/webroot/js/vendors.php
  131. +49 −68 index.php
View
@@ -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>
View
@@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
-1.1.2.2887
+1.1.2.2955
@@ -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
@@ -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
?>
View
@@ -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');
?>
@@ -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' => '');
}
-
?>
Oops, something went wrong.

0 comments on commit e5c074a

Please sign in to comment.