Permalink
Browse files

Merging changes to the trunk.

Updated headers.
beginning to clean up files that are not used in this version of Cake

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1593 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent 217923e commit c7d02c8068ee90851c076abdfe94b730ed179f7e @phpnut phpnut committed Dec 23, 2005
Showing with 1,923 additions and 2,116 deletions.
  1. +12 −14 app/config/acl.ini.php
  2. +17 −20 app/config/core.php
  3. +7 −10 app/config/database.php.default
  4. +7 −10 app/config/routes.php
  5. +7 −10 app/config/routes.php.default
  6. +7 −10 app/index.php
  7. 0 app/models/put_models_here
  8. 0 app/plugins/put_3rd_party_cake_apps_here
  9. 0 app/views/put_views_folders_here
  10. +7 −10 app/webroot/css.php
  11. +174 −182 app/webroot/css/cake.default.css
  12. +7 −19 app/webroot/css/cake.forms.css
  13. +9 −0 app/webroot/css/cake.ie.css
  14. +0 −155 app/webroot/css/cake.scaffold.css
  15. BIN app/webroot/favicon.ico
  16. 0 app/webroot/files/put_downloadable_files_here
  17. BIN app/webroot/img/cake.bg.body.gif
  18. BIN app/webroot/img/cake.bg.header.gif
  19. BIN app/webroot/img/cake.header_bg.png
  20. BIN app/webroot/img/cake.logo.png
  21. BIN app/webroot/img/cake.power.png
  22. BIN app/webroot/img/cake.redbox.gif
  23. BIN app/webroot/img/pbcake.gif
  24. BIN app/webroot/img/w3c_css.png
  25. BIN app/webroot/img/w3c_xhtml10.png
  26. +12 −15 app/webroot/index.php
  27. +7 −10 app/webroot/js/vendors.php
  28. +7 −10 cake/app_controller.php
  29. +7 −10 cake/app_model.php
  30. +7 −10 cake/basics.php
  31. +7 −10 cake/config/inflections/nouns.php
  32. +7 −10 cake/config/paths.php
  33. +20 −22 cake/config/tags.ini.php
  34. +9 −14 cake/dispatcher.php
  35. +7 −10 cake/libs/cache.php
  36. +7 −8 cake/libs/class_registry.php
  37. +7 −8 cake/libs/controller/component.php
  38. +8 −10 cake/libs/controller/components/acl.php
  39. +6 −8 cake/libs/controller/components/acl_base.php
  40. +8 −10 cake/libs/controller/components/dbacl/db_acl.php
  41. +6 −8 cake/libs/controller/components/dbacl/models/aclnode.php
  42. +6 −8 cake/libs/controller/components/dbacl/models/aco.php
  43. +6 −8 cake/libs/controller/components/dbacl/models/acoaction.php
  44. +6 −8 cake/libs/controller/components/dbacl/models/aro.php
  45. +6 −8 cake/libs/controller/components/dbacl/models/aros_aco.php
  46. +32 −35 cake/libs/controller/components/iniacl/ini_acl.php
  47. +5 −6 cake/libs/controller/components/session.php
  48. +17 −18 cake/libs/controller/controller.php
  49. +7 −10 cake/libs/controller/pages_controller.php
  50. +8 −10 cake/libs/controller/scaffold.php
  51. +14 −15 cake/libs/controller/templates/scaffolds/edit.thtml
  52. +11 −13 cake/libs/controller/templates/scaffolds/list.thtml
  53. +9 −11 cake/libs/controller/templates/scaffolds/new.thtml
  54. +30 −33 cake/libs/controller/templates/scaffolds/show.thtml
  55. +7 −10 cake/libs/error_messages.php
  56. +7 −10 cake/libs/file.php
  57. +7 −10 cake/libs/flay.php
  58. +7 −10 cake/libs/folder.php
  59. +7 −10 cake/libs/generator/base.php
  60. +7 −10 cake/libs/generator/commands.php
  61. +7 −10 cake/libs/generator/generators/applications/app/app_generator.php
  62. +7 −10 cake/libs/generator/generators/class_templates/controller/controller_generator.php
  63. +7 −10 cake/libs/generator/generators/class_templates/controller/templates/component.php
  64. +7 −10 cake/libs/generator/generators/class_templates/controller/templates/controller.php
  65. +7 −10 cake/libs/generator/generators/class_templates/controller/templates/functional_test.php
  66. +7 −10 cake/libs/generator/generators/class_templates/model/model_generator.php
  67. +7 −10 cake/libs/generator/generators/class_templates/model/templates/fixtures.php
  68. +7 −10 cake/libs/generator/generators/class_templates/model/templates/model.php
  69. +7 −10 cake/libs/generator/generators/class_templates/model/templates/unit_test.php
  70. +7 −10 cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php
  71. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/controller.php
  72. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml
  73. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/form_scaffolding.thtml
  74. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/functional_test.php
  75. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/helper.php
  76. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml
  77. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/view_edit.thtml
  78. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/view_list.thtml
  79. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/view_new.thtml
  80. +7 −10 cake/libs/generator/generators/class_templates/scaffold/templates/view_show.thtml
  81. +7 −10 cake/libs/generator/generators/class_templates/view/templates/helper.php
  82. +7 −10 cake/libs/generator/generators/class_templates/view/templates/view.thtml
  83. +7 −10 cake/libs/generator/generators/class_templates/view/view_generator.php
  84. +7 −10 cake/libs/generator/generators/class_templates/web/templates/api_definition.php
  85. +7 −10 cake/libs/generator/generators/class_templates/web/templates/controller.php
  86. +7 −10 cake/libs/generator/generators/class_templates/web/templates/functional_test.php
  87. +7 −10 cake/libs/generator/generators/class_templates/web/web_generator.php
  88. +7 −10 cake/libs/generator/lookup.php
  89. +7 −10 cake/libs/generator/manifest.php
  90. +7 −10 cake/libs/generator/options.php
  91. +7 −10 cake/libs/generator/scripts.php
  92. +7 −10 cake/libs/generator/scripts/destroy.php
  93. +7 −10 cake/libs/generator/scripts/generate.php
  94. +7 −10 cake/libs/generator/scripts/update.php
  95. +7 −10 cake/libs/generator/simple_logger.php
  96. +7 −10 cake/libs/generator/spec.php
  97. +7 −10 cake/libs/inflector.php
  98. +7 −10 cake/libs/legacy.php
  99. +7 −10 cake/libs/log.php
  100. +7 −10 cake/libs/model/dbo/dbo.php
  101. +7 −10 cake/libs/model/dbo/dbo_adodb.php
  102. +61 −67 cake/libs/model/dbo/dbo_factory.php
  103. +7 −10 cake/libs/model/dbo/dbo_generic.php
  104. +34 −37 cake/libs/model/dbo/dbo_mysql.php
  105. +7 −10 cake/libs/model/dbo/dbo_pear.php
  106. +7 −10 cake/libs/model/dbo/dbo_postgres.php
  107. +7 −10 cake/libs/model/dbo/dbo_sqlite.php
  108. +42 −32 cake/libs/model/model.php
  109. +7 −10 cake/libs/neat_array.php
  110. +7 −10 cake/libs/neat_string.php
  111. +7 −8 cake/libs/new_inflector.php
  112. +7 −10 cake/libs/object.php
  113. +7 −10 cake/libs/router.php
  114. +8 −10 cake/libs/sanitize.php
  115. +5 −6 cake/libs/security.php
  116. +5 −6 cake/libs/session.php
  117. +7 −10 cake/libs/validators.php
  118. +8 −10 cake/libs/view/helper.php
  119. +8 −10 cake/libs/view/helpers/ajax.php
  120. +42 −38 cake/libs/view/helpers/form.php
  121. +8 −10 cake/libs/view/helpers/html.php
  122. +7 −10 cake/libs/view/helpers/javascript.php
  123. +8 −12 cake/libs/view/helpers/number.php
  124. +17 −21 cake/libs/view/helpers/text.php
  125. +7 −10 cake/libs/view/helpers/time.php
  126. +30 −0 cake/libs/view/templates/errors/error404.thtml
  127. +7 −10 cake/libs/view/templates/errors/missing_action.thtml
  128. +7 −10 cake/libs/view/templates/errors/missing_controller.thtml
  129. +7 −10 cake/libs/view/templates/errors/missing_database.thtml
  130. +74 −77 cake/libs/view/templates/errors/missing_helper_class.thtml
  131. +74 −77 cake/libs/view/templates/errors/missing_helper_file.thtml
  132. +7 −10 cake/libs/view/templates/errors/missing_scaffolddb.thtml
  133. +7 −10 cake/libs/view/templates/errors/missing_table.thtml
  134. +7 −10 cake/libs/view/templates/errors/missing_view.thtml
  135. +8 −11 cake/libs/view/templates/errors/private_action.thtml
  136. +7 −10 cake/libs/view/templates/layouts/ajax.thtml
  137. +66 −55 cake/libs/view/templates/layouts/default.thtml
  138. +7 −10 cake/libs/view/templates/layouts/flash.thtml
  139. +48 −39 cake/libs/view/templates/pages/home.thtml
  140. +8 −10 cake/libs/view/view.php
  141. +336 −94 cake/scripts/acl.php
  142. +7 −10 cake/scripts/bake.php
  143. +7 −10 cake/scripts/test.php
  144. +7 −10 index.php
  145. 0 tmp/logs/put_logs_here
  146. 0 vendors/put_vendor_libraries_here
View
@@ -2,23 +2,21 @@
; SVN FILE: $Id$
;/**
; * Short description for file.
-; *
+; *
; *
; * PHP versions 4 and 5
; *
; * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
-; * Copyright (c) 2005, CakePHP Authors/Developers
-; *
-; * Author(s): Larry E. Masters aka PhpNut <nut@phpnut.com>
-; * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+; * Copyright (c) 2005, 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
-; * @author CakePHP Authors/Developers
-; * @copyright Copyright (c) 2005, CakePHP Authors/Developers
-; * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+; * @filesource
+; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
; * @package cake
; * @subpackage cake.cake.app.config
; * @since CakePHP v 0.10.0.1076
@@ -28,12 +26,12 @@
; * @license http://www.opensource.org/licenses/mit-license.php The MIT License
; */
-; acl.ini.php - Cake ACL Configuration
+; acl.ini.php - Cake ACL Configuration
; ---------------------------------------------------------------------
-; Use this file to specify user permissions.
+; Use this file to specify user permissions.
; aco = access control object (something in your application)
; aro = access request object (something requesting access)
-;
+;
; User records are added as follows:
;
; [uid]
@@ -42,13 +40,13 @@
; deny = aco4, aco5, aco6
;
; Group records are added in a similar manner:
-;
+;
; [gid]
; allow = aco1, aco2, aco3
; deny = aco4, aco5, aco6
;
; The allow, deny, and groups sections are all optional.
-; NOTE: groups names *cannot* ever be the same as usernames!
+; NOTE: groups names *cannot* ever be the same as usernames!
;
; ACL permissions are checked in the following order:
; 1. Check for user denies (and DENY if specified)
View
@@ -2,26 +2,23 @@
/* 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 <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
- *
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- * Larry E. Masters aka PhpNut <nut@phpnut.com>
- * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+ * Copyright (c) 2005, 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.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
- * @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @filesource
+ * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
* @since CakePHP v 0.2.9
@@ -37,10 +34,10 @@
* uncomment the line below.
* Note: If you do have mod rewrite but prefer the
* CakePHP pretty urls, you also have to remove the
- * .htaccess files
- * release/.htaccess
- * release/app/.htaccess
- * release/app/webroot/.htaccess
+ * .htaccess files
+ * release/.htaccess
+ * release/app/.htaccess
+ * release/app/webroot/.htaccess
*/
//define ('BASE_URL', $_SERVER['SCRIPT_NAME']);
@@ -52,7 +49,7 @@
* - 2: full debug with sql
* - 3: full debug with sql and dump of the current object
*
- * In production, the "flash messages" redirect after a time interval.
+ * In production, the "flash messages" redirect after a time interval.
* With the other debug levels you get to click the "flash message" to continue.
*
*/
@@ -79,7 +76,7 @@
* Setting this to cake will save files to /cakedistro/tmp directory
* Setting it to php will use the php default save path
* Setting it to database will use the database
- *
+ *
*
*/
define('CAKE_SESSION_SAVE', 'php');
@@ -97,7 +94,7 @@
* The define below is used to turn cake built webservices
* on or off. Default setting is off.
*/
-define('WEBSERVICES', 'on');
+define('WEBSERVICES', 'off');
/**
* Compress output CSS (removing comments, whitespace, repeating tags etc.)
@@ -9,19 +9,16 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
+ * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * 1785 E. Sahara Avenue, Suite 490-204
+ * Las Vegas, Nevada 89104
*
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- * Larry E. Masters aka PhpNut <nut@phpnut.com>
- * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
* @since CakePHP v 0.2.9
View
@@ -11,19 +11,16 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
+ * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * 1785 E. Sahara Avenue, Suite 490-204
+ * Las Vegas, Nevada 89104
*
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- * Larry E. Masters aka PhpNut <nut@phpnut.com>
- * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
* @since CakePHP v 0.2.9
@@ -11,19 +11,16 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
+ * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * 1785 E. Sahara Avenue, Suite 490-204
+ * Las Vegas, Nevada 89104
*
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- * Larry E. Masters aka PhpNut <nut@phpnut.com>
- * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.config
* @since CakePHP v 0.2.9
View
@@ -5,19 +5,16 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
+ * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * 1785 E. Sahara Avenue, Suite 490-204
+ * Las Vegas, Nevada 89104
*
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- * Larry E. Masters aka PhpNut <nut@phpnut.com>
- * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app
* @since CakePHP v 0.10.0.1076
No changes.
No changes.
No changes.
View
@@ -9,19 +9,16 @@
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2005, CakePHP Authors/Developers
+ * Copyright (c) 2005, Cake Software Foundation, Inc.
+ * 1785 E. Sahara Avenue, Suite 490-204
+ * Las Vegas, Nevada 89104
*
- * Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
- * Larry E. Masters aka PhpNut <nut@phpnut.com>
- * Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @copyright Copyright (c) 2005, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.app.webroot
* @since CakePHP v 0.2.9
Oops, something went wrong.

0 comments on commit c7d02c8

Please sign in to comment.