Permalink
Browse files

Merge branch '2.0' into 2.1

Conflicts:
	lib/Cake/VERSION.txt
  • Loading branch information...
markstory committed Oct 18, 2011
2 parents d309df9 + 55064b6 commit 92d028630c3e7b62724bc7d1b518f9e986da84da
Showing with 3,929 additions and 2,433 deletions.
  1. +1 −0 .gitignore
  2. +12 −1 app/Config/Schema/db_acl.php
  3. +12 −1 app/Config/Schema/i18n.php
  4. +12 −1 app/Config/Schema/sessions.php
  5. +2 −3 app/Config/acl.ini.php
  6. +12 −12 app/Config/bootstrap.php
  7. +1 −1 app/Config/core.php
  8. +3 −1 app/Config/database.php.default
  9. +14 −5 app/Config/email.php.default
  10. +1 −1 app/Config/routes.php
  11. +15 −7 app/Console/cake
  12. +32 −32 app/Console/cake.bat
  13. +2 −2 app/webroot/.htaccess
  14. +6 −0 app/webroot/css/cake.generic.css
  15. +1 −1 app/webroot/test.php
  16. +24 −15 lib/Cake/Cache/Engine/FileEngine.php
  17. +4 −1 lib/Cake/Cache/Engine/MemcacheEngine.php
  18. +1 −1 lib/Cake/Config/config.php
  19. +5 −5 lib/Cake/Configure/PhpReader.php
  20. +1 −1 lib/Cake/Console/Command/AclShell.php
  21. +4 −3 lib/Cake/Console/Command/BakeShell.php
  22. +1 −1 lib/Cake/Console/Command/CommandListShell.php
  23. +2 −2 lib/Cake/Console/Command/SchemaShell.php
  24. +4 −1 lib/Cake/Console/Command/Task/BakeTask.php
  25. +2 −2 lib/Cake/Console/Command/Task/ControllerTask.php
  26. +5 −5 lib/Cake/Console/Command/Task/DbConfigTask.php
  27. +2 −0 lib/Cake/Console/Command/Task/ModelTask.php
  28. +0 −2 lib/Cake/Console/Command/Task/PluginTask.php
  29. +52 −29 lib/Cake/Console/Command/Task/TestTask.php
  30. +3 −2 lib/Cake/Console/Command/Task/ViewTask.php
  31. +71 −5 lib/Cake/Console/Command/UpgradeShell.php
  32. +14 −4 lib/Cake/Console/ConsoleErrorHandler.php
  33. +7 −7 lib/Cake/Console/Shell.php
  34. +7 −5 lib/Cake/Console/ShellDispatcher.php
  35. +4 −2 lib/Cake/Console/TaskCollection.php
  36. +1 −1 lib/Cake/Console/Templates/default/actions/controller_actions.ctp
  37. +1 −1 lib/Cake/Console/Templates/default/classes/controller.ctp
  38. +1 −1 lib/Cake/Console/Templates/default/classes/fixture.ctp
  39. +1 −1 lib/Cake/Console/Templates/default/classes/model.ctp
  40. +2 −3 lib/Cake/Console/Templates/default/classes/test.ctp
  41. +1 −1 lib/Cake/Console/Templates/default/views/form.ctp
  42. +16 −3 lib/Cake/Console/Templates/default/views/home.ctp
  43. +1 −1 lib/Cake/Console/Templates/default/views/index.ctp
  44. +1 −1 lib/Cake/Console/Templates/default/views/view.ctp
  45. +1 −1 lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
  46. +1 −1 lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
  47. +1 −1 lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
  48. +2 −3 lib/Cake/Console/Templates/skel/Config/acl.ini.php
  49. +11 −11 lib/Cake/Console/Templates/skel/Config/bootstrap.php
  50. +2 −2 lib/Cake/Console/Templates/skel/Config/core.php
  51. +2 −0 lib/Cake/Console/Templates/skel/Config/database.php.default
  52. +13 −4 lib/Cake/Console/Templates/skel/Config/email.php.default
  53. +13 −5 lib/Cake/Console/Templates/skel/Console/cake
  54. +32 −32 lib/Cake/Console/Templates/skel/Console/cake.bat
  55. +1 −1 lib/Cake/Console/Templates/skel/Controller/AppController.php
  56. +2 −2 lib/Cake/Console/Templates/skel/Controller/PagesController.php
  57. +1 −1 lib/Cake/Console/Templates/skel/Model/AppModel.php
  58. +1 −1 lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
  59. +1 −1 lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp
  60. +3 −2 lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
  61. +1 −1 lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
  62. +1 −1 lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
  63. +2 −2 lib/Cake/Console/Templates/skel/webroot/.htaccess
  64. +276 −91 lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
  65. +4 −1 lib/Cake/Console/Templates/skel/webroot/index.php
  66. +1 −1 lib/Cake/Console/Templates/skel/webroot/test.php
  67. +11 −3 lib/Cake/Console/cake
  68. +1 −1 lib/Cake/Controller/AppController.php
  69. +5 −2 lib/Cake/Controller/Component.php
  70. +4 −4 lib/Cake/Controller/Component/AclComponent.php
  71. +12 −1 lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
  72. +19 −1 lib/Cake/Controller/Component/Auth/BaseAuthorize.php
  73. +2 −1 lib/Cake/Controller/Component/Auth/CrudAuthorize.php
  74. +1 −1 lib/Cake/Controller/Component/Auth/FormAuthenticate.php
  75. +22 −19 lib/Cake/Controller/Component/AuthComponent.php
  76. +1 −1 lib/Cake/Controller/Component/CookieComponent.php
  77. +2 −3 lib/Cake/Controller/Component/EmailComponent.php
  78. +17 −15 lib/Cake/Controller/Component/PaginatorComponent.php
  79. +37 −15 lib/Cake/Controller/Component/RequestHandlerComponent.php
  80. +5 −5 lib/Cake/Controller/Component/SecurityComponent.php
  81. +8 −9 lib/Cake/Controller/Component/SessionComponent.php
  82. +2 −3 lib/Cake/Controller/ComponentCollection.php
  83. +22 −24 lib/Cake/Controller/Controller.php
  84. +1 −1 lib/Cake/Controller/PagesController.php
  85. +11 −11 lib/Cake/Controller/Scaffold.php
  86. +109 −96 lib/Cake/Core/App.php
  87. +2 −1 lib/Cake/Core/CakePlugin.php
  88. +14 −7 lib/Cake/Core/Configure.php
  89. +4 −2 lib/Cake/Core/Object.php
  90. +2 −2 lib/Cake/Error/ErrorHandler.php
  91. +5 −5 lib/Cake/Error/ExceptionRenderer.php
  92. +18 −60 lib/Cake/Error/exceptions.php
  93. +1 −1 lib/Cake/I18n/I18n.php
  94. +4 −4 lib/Cake/Model/AclNode.php
  95. +0 −2 lib/Cake/Model/Aco.php
  96. +0 −2 lib/Cake/Model/AcoAction.php
  97. +1 −3 lib/Cake/Model/AppModel.php
  98. +7 −6 lib/Cake/Model/Behavior/AclBehavior.php
  99. +2 −25 lib/Cake/Model/Behavior/ContainableBehavior.php
  100. +10 −16 lib/Cake/Model/Behavior/TranslateBehavior.php
  101. +15 −15 lib/Cake/Model/Behavior/TreeBehavior.php
  102. +4 −4 lib/Cake/Model/BehaviorCollection.php
  103. +1 −2 lib/Cake/Model/CakeSchema.php
  104. +6 −15 lib/Cake/Model/ConnectionManager.php
  105. +2 −4 lib/Cake/Model/Datasource/DataSource.php
  106. +33 −25 lib/Cake/Model/Datasource/Database/Mysql.php
  107. +9 −13 lib/Cake/Model/Datasource/Database/Postgres.php
  108. +5 −4 lib/Cake/Model/Datasource/Database/Sqlite.php
  109. +9 −6 lib/Cake/Model/Datasource/Database/Sqlserver.php
  110. +18 −11 lib/Cake/Model/Datasource/DboSource.php
  111. +9 −0 lib/Cake/Model/Datasource/Session/CacheSession.php
  112. +34 −14 lib/Cake/Model/Datasource/Session/DatabaseSession.php
  113. +52 −45 lib/Cake/Model/Model.php
  114. +0 −2 lib/Cake/Model/Permission.php
  115. +7 −7 lib/Cake/Network/CakeRequest.php
  116. +73 −34 lib/Cake/Network/Email/CakeEmail.php
  117. +3 −4 lib/Cake/Network/Email/MailTransport.php
  118. +7 −7 lib/Cake/Network/Email/SmtpTransport.php
  119. +5 −0 lib/Cake/Network/Http/HttpResponse.php
  120. +10 −3 lib/Cake/Routing/Dispatcher.php
  121. +1 −1 lib/Cake/Routing/Router.php
  122. +1 −1 lib/Cake/Test/Case/AllBehaviorsTest.php
  123. +1 −1 lib/Cake/Test/Case/AllControllerTest.php
  124. +1 −1 lib/Cake/Test/Case/AllHelpersTest.php
  125. +1 −1 lib/Cake/Test/Case/AllRoutingTest.php
  126. +1 −1 lib/Cake/Test/Case/AllTestSuiteTest.php
  127. +1 −1 lib/Cake/Test/Case/AllTestsTest.php
  128. +3 −2 lib/Cake/Test/Case/Cache/CacheTest.php
  129. +42 −0 lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
  130. +11 −0 lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
  131. +1 −1 lib/Cake/Test/Case/Configure/IniReaderTest.php
  132. +4 −4 lib/Cake/Test/Case/Console/Command/AclShellTest.php
  133. +1 −1 lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
  134. +30 −11 lib/Cake/Test/Case/Console/Command/ShellTest.php
  135. +9 −9 lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
  136. +5 −25 lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
  137. +44 −65 lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
  138. +15 −15 lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
  139. +49 −9 lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
  140. +32 −27 lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
  141. +2 −2 lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
  142. +24 −6 lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
  143. +17 −0 lib/Cake/Test/Case/Console/HelpFormatterTest.php
  144. +3 −3 lib/Cake/Test/Case/Console/TaskCollectionTest.php
  145. +3 −0 lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
  146. +3 −0 lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
  147. +3 −0 lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
  148. +5 −2 lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
  149. +3 −0 lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
  150. +6 −2 lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
  151. +5 −0 lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
  152. +18 −0 lib/Cake/Test/Case/Controller/Component/DbAclTest.php
  153. +1 −1 lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
  154. +18 −0 lib/Cake/Test/Case/Controller/Component/IniAclTest.php
  155. +53 −1 lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
  156. +55 −13 lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
  157. +2 −2 lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
  158. +4 −534 lib/Cake/Test/Case/Controller/ScaffoldTest.php
  159. +19 −2 lib/Cake/Test/Case/Core/AppTest.php
  160. +17 −1 lib/Cake/Test/Case/Core/CakePluginTest.php
  161. +14 −0 lib/Cake/Test/Case/Core/ConfigureTest.php
  162. +22 −10 lib/Cake/Test/Case/Core/ObjectTest.php
  163. +1 −1 lib/Cake/Test/Case/Error/ErrorHandlerTest.php
  164. +17 −42 lib/Cake/Test/Case/Error/ExceptionRendererTest.php
  165. +2 −2 lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
  166. +75 −1 lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
  167. +1 −1 lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
  168. +11 −21 lib/Cake/Test/Case/Model/CakeSchemaTest.php
  169. +1 −2 lib/Cake/Test/Case/Model/ConnectionManagerTest.php
  170. +74 −14 lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
  171. +37 −21 lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
  172. +4 −1 lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
  173. +17 −0 lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
  174. +98 −42 lib/Cake/Test/Case/Model/ModelIntegrationTest.php
  175. +10 −4 lib/Cake/Test/Case/Model/ModelReadTest.php
  176. +42 −2 lib/Cake/Test/Case/Model/ModelValidationTest.php
  177. +122 −95 lib/Cake/Test/Case/Model/ModelWriteTest.php
  178. +142 −9 lib/Cake/Test/Case/Model/models.php
  179. +6 −6 lib/Cake/Test/Case/Network/CakeRequestTest.php
  180. +63 −0 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
  181. +1 −1 lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
  182. +1 −1 lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
  183. +91 −0 lib/Cake/Test/Case/Routing/DispatcherTest.php
  184. +17 −0 lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
  185. +18 −0 lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php
  186. +17 −0 lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php
  187. +4 −0 lib/Cake/Test/Case/Routing/RouterTest.php
  188. +11 −11 lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
  189. +2 −1 lib/Cake/Test/Case/Utility/DebuggerTest.php
  190. +17 −17 lib/Cake/Test/Case/Utility/FileTest.php
  191. +40 −1 lib/Cake/Test/Case/Utility/FolderTest.php
  192. +4 −3 lib/Cake/Test/Case/Utility/InflectorTest.php
  193. +11 −1 lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
  194. +20 −0 lib/Cake/Test/Case/Utility/SetTest.php
  195. +2 −0 lib/Cake/Test/Case/Utility/ValidationTest.php
  196. +110 −1 lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  197. +3 −6 lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
  198. +2 −7 lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
  199. +2 −5 lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
  200. +10 −0 lib/Cake/Test/Case/View/Helper/TextHelperTest.php
  201. +10 −2 lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
  202. +2 −2 lib/Cake/Test/Case/View/HelperCollectionTest.php
  203. +6 −2 lib/Cake/Test/Case/View/HelperTest.php
  204. +1 −1 lib/Cake/Test/Case/View/MediaViewTest.php
  205. +462 −0 lib/Cake/Test/Case/View/ScaffoldViewTest.php
  206. +3 −3 lib/Cake/Test/Case/View/ThemeViewTest.php
  207. +2 −2 lib/Cake/Test/Case/View/ViewTest.php
  208. +10 −10 lib/Cake/Test/Fixture/AroTwoFixture.php
  209. +20 −20 lib/Cake/Test/Fixture/ArosAcoTwoFixture.php
  210. +5 −5 lib/Cake/Test/Fixture/DataTestFixture.php
  211. +4 −4 lib/Cake/Test/Fixture/DatatypeFixture.php
  212. +3 −3 lib/Cake/Test/Fixture/PrefixTestFixture.php
  213. +1 −1 lib/Cake/Test/test_app/Console/Command/SampleShell.php
  214. +1 −1 lib/Cake/Test/test_app/Controller/TestsAppsController.php
  215. +1 −1 lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
  216. +1 −0 lib/Cake/Test/test_app/View/Elements/test_element.xml
  217. +2 −1 lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp
  218. 0 ...Cake/Test/test_app/View/Themed/TestTheme/{Plugins → Plugin}/TestPlugin/Layouts/plugin_default.ctp
  219. 0 lib/Cake/Test/test_app/View/Themed/TestTheme/{Plugins → Plugin}/TestPlugin/Tests/index.ctp
  220. +4 −0 lib/Cake/Test/test_app/View/Themed/TestTheme/Posts/themed.ctp
  221. BIN lib/Cake/Test/test_app/webroot/img/cake.power.gif
  222. +1 −0 lib/Cake/TestSuite/CakeTestLoader.php
  223. +1 −1 lib/Cake/TestSuite/CakeTestRunner.php
  224. +1 −1 lib/Cake/TestSuite/CakeTestSuite.php
  225. +1 −1 lib/Cake/TestSuite/CakeTestSuiteCommand.php
  226. +10 −7 lib/Cake/TestSuite/ControllerTestCase.php
  227. +2 −4 lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
  228. +0 −2 lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
  229. +0 −2 lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
  230. +0 −2 lib/Cake/TestSuite/Reporter/CakeTextReporter.php
  231. +6 −10 lib/Cake/TestSuite/templates/phpunit.php
  232. +11 −10 lib/Cake/Utility/Debugger.php
  233. +3 −3 lib/Cake/Utility/File.php
  234. +1 −1 lib/Cake/Utility/Folder.php
  235. +16 −12 lib/Cake/Utility/Inflector.php
  236. +2 −1 lib/Cake/Utility/ObjectCollection.php
  237. +1 −1 lib/Cake/Utility/Set.php
  238. +1 −1 lib/Cake/Utility/Validation.php
  239. +1 −1 lib/Cake/View/Elements/exception_stack_trace.ctp
  240. +1 −1 lib/Cake/View/Elements/sql_dump.ctp
  241. +1 −1 lib/Cake/View/Emails/html/default.ctp
  242. +1 −1 lib/Cake/View/Emails/text/default.ctp
  243. +1 −1 lib/Cake/View/Errors/error400.ctp
  244. +1 −1 lib/Cake/View/Errors/error500.ctp
  245. +2 −2 lib/Cake/View/Errors/missing_action.ctp
  246. +8 −7 lib/Cake/View/Errors/{missing_behavior_class.ctp → missing_behavior.ctp}
  247. +0 −39 lib/Cake/View/Errors/missing_behavior_file.ctp
  248. +7 −6 lib/Cake/View/Errors/{missing_component_file.ctp → missing_component.ctp}
  249. +1 −1 lib/Cake/View/Errors/missing_connection.ctp
  250. +5 −4 lib/Cake/View/Errors/missing_controller.ctp
  251. +2 −2 lib/Cake/View/Errors/missing_database.ctp
  252. +5 −4 lib/Cake/View/Errors/{missing_datasource_file.ctp → missing_datasource.ctp}
  253. +1 −1 lib/Cake/View/Errors/missing_datasource_config.ctp
  254. +7 −6 lib/Cake/View/Errors/{missing_component_class.ctp → missing_helper.ctp}
  255. +0 −39 lib/Cake/View/Errors/missing_helper_class.ctp
  256. +0 −39 lib/Cake/View/Errors/missing_helper_file.ctp
  257. +1 −1 lib/Cake/View/Errors/missing_layout.ctp
  258. +1 −1 lib/Cake/View/Errors/missing_plugin.ctp
  259. +1 −1 lib/Cake/View/Errors/missing_table.ctp
  260. +1 −1 lib/Cake/View/Errors/missing_view.ctp
  261. +1 −1 lib/Cake/View/Errors/pdo_error.ctp
  262. +1 −1 lib/Cake/View/Errors/private_action.ctp
  263. +1 −1 lib/Cake/View/Errors/scaffold_error.ctp
  264. +12 −13 lib/Cake/View/Helper.php
  265. +1 −1 lib/Cake/View/Helper/AppHelper.php
  266. +1 −1 lib/Cake/View/Helper/CacheHelper.php
  267. +80 −52 lib/Cake/View/Helper/FormHelper.php
  268. +18 −17 lib/Cake/View/Helper/HtmlHelper.php
  269. +3 −3 lib/Cake/View/Helper/JsHelper.php
  270. +10 −10 lib/Cake/View/Helper/NumberHelper.php
  271. +3 −3 lib/Cake/View/Helper/PaginatorHelper.php
  272. +1 −1 lib/Cake/View/Helper/RssHelper.php
  273. +6 −6 lib/Cake/View/Helper/SessionHelper.php
  274. +10 −10 lib/Cake/View/Helper/TextHelper.php
  275. +34 −23 lib/Cake/View/Helper/TimeHelper.php
  276. +3 −3 lib/Cake/View/HelperCollection.php
  277. +1 −1 lib/Cake/View/Layouts/Emails/html/default.ctp
  278. +1 −1 lib/Cake/View/Layouts/Emails/text/default.ctp
  279. +1 −1 lib/Cake/View/Layouts/ajax.ctp
  280. +1 −1 lib/Cake/View/Layouts/default.ctp
  281. +2 −2 lib/Cake/View/Layouts/flash.ctp
  282. +19 −6 lib/Cake/View/Pages/home.ctp
  283. +1 −1 lib/Cake/View/Scaffolds/form.ctp
  284. +1 −1 lib/Cake/View/Scaffolds/index.ctp
  285. +1 −1 lib/Cake/View/Scaffolds/view.ctp
  286. +5 −3 lib/Cake/View/ThemeView.php
  287. +1 −1 lib/Cake/View/View.php
  288. +11 −11 lib/Cake/basics.php
View
@@ -1,5 +1,6 @@
/app/Config
/app/tmp
+/lib/Cake/Console/Templates/skel/tmp/
/plugins
/vendors
.DS_Store
@@ -1,5 +1,6 @@
<?php
/*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
+
/**
* This is Acl Schema file
*
@@ -15,10 +16,11 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config.sql
+ * @package app.Config.Schema
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
+
/*
*
* Using the Schema command line utility
@@ -27,6 +29,15 @@
*/
class DbAclSchema extends CakeSchema {
+ public $name = 'DbAcl';
+
+ public function before($event = array()) {
+ return true;
+ }
+
+ public function after($event = array()) {
+ }
+
public $acos = array(
'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
View
@@ -1,5 +1,6 @@
<?php
/*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
+
/**
* This is i18n Schema file
*
@@ -15,10 +16,11 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config.sql
+ * @package app.Config.Schema
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
+
/*
*
* Using the Schema command line utility
@@ -27,6 +29,15 @@
*/
class i18nSchema extends CakeSchema {
+ public $name = 'i18n';
+
+ public function before($event = array()) {
+ return true;
+ }
+
+ public function after($event = array()) {
+ }
+
public $i18n = array(
'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
@@ -1,5 +1,6 @@
<?php
/*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
+
/**
* This is Sessions Schema file
*
@@ -15,10 +16,11 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config.sql
+ * @package app.Config.Schema
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
+
/*
*
* Using the Schema command line utility
@@ -27,6 +29,15 @@
*/
class SessionsSchema extends CakeSchema {
+ public $name = 'Sessions';
+
+ public function before($event = array()) {
+ return true;
+ }
+
+ public function after($event = array()) {
+ }
+
public $cake_sessions = array(
'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
View
@@ -1,20 +1,19 @@
;<?php exit() ?>
-; SVN FILE: $Id$
;/**
; * ACL Configuration
; *
; *
; * PHP 5
; *
-; * CakePHP(tm) : Rapid Development Framework http://cakephp.org
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
; * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
; *
; * Licensed under The MIT License
; * Redistributions of files must retain the above copyright notice.
; *
; * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
; * @link http://cakephp.org CakePHP(tm) Project
-; * @package app.config
+; * @package app.Config
; * @since CakePHP(tm) v 0.10.0.1076
; * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
; */
View
@@ -18,7 +18,7 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config
+ * @package app.Config
* @since CakePHP(tm) v 0.10.8.2117
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -30,16 +30,16 @@
* The settings below can be used to set additional paths to models, views and controllers.
*
* App::build(array(
- * 'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
- * 'models' => array('/full/path/to/models/', '/next/full/path/to/models/'),
- * 'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
- * 'controllers' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
- * 'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
- * 'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
- * 'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
- * 'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
- * 'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
- * 'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ * 'Plugin' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ * 'Model' => array('/full/path/to/models/', '/next/full/path/to/models/'),
+ * 'View' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ * 'Controller' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ * 'Model/Datasource' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ * 'Model/Behavior' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ * 'Controller/Component' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ * 'View/Helper' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ * 'Vendor' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ * 'Console/Command' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
* 'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
* ));
*
@@ -62,4 +62,4 @@
* CakePlugin::loadAll(); // Loads all plugins at once
* CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
*
- */
+ */
View
@@ -14,7 +14,7 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config
+ * @package app.Config
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -14,7 +14,7 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config
+ * @package app.Config
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -54,6 +54,8 @@
* For MySQL, Postgres specifies the character encoding to use when connecting to the
* database. Uses database default not specified.
*
+ * unix_socket =>
+ * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
*/
class DATABASE_CONFIG {
@@ -14,7 +14,7 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config
+ * @package app.Config
* @since CakePHP(tm) v 2.0.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -30,6 +30,7 @@
* transport => The name of a supported transport; valid options are as follows:
* Mail - Send using PHP mail function
* Smtp - Send using SMTP
+ * Debug - Do not send the email, just return the result
*
* You can add custom transports (or override existing transports) by adding the
* appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',
@@ -43,18 +44,23 @@ class EmailConfig {
public $default = array(
'transport' => 'Mail',
- 'from' => 'you@localhost'
+ 'from' => 'you@localhost',
+ //'charset' => 'utf-8',
+ //'headerCharset' => 'utf-8',
);
public $smtp = array(
'transport' => 'Smtp',
- 'from' => array('My Site', 'site@localhost'),
+ 'from' => array('site@localhost' => 'My Site'),
'host' => 'localhost',
'port' => 25,
'timeout' => 30,
'username' => 'user',
'password' => 'secret',
- 'client' => null
+ 'client' => null,
+ 'log' => false
+ //'charset' => 'utf-8',
+ //'headerCharset' => 'utf-8',
);
public $fast = array(
@@ -82,7 +88,10 @@ class EmailConfig {
'timeout' => 30,
'username' => 'user',
'password' => 'secret',
- 'client' => null
+ 'client' => null,
+ 'log' => true,
+ //'charset' => 'utf-8',
+ //'headerCharset' => 'utf-8',
);
}
View
@@ -16,7 +16,7 @@
*
* @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package app.config
+ * @package app.Config
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
View
@@ -11,15 +11,23 @@
# Redistributions of files must retain the above copyright notice.
#
# @copyright Copyright 2005-2011, Cake Software Foundation, Inc.
-# @link http://cakephp.org CakePHP(tm) Project
-# @package app.console
-# @since CakePHP(tm) v 2.0
-# @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+# @link http://cakephp.org CakePHP(tm) Project
+# @package app.Console
+# @since CakePHP(tm) v 2.0
+# @license MIT License (http://www.opensource.org/licenses/mit-license.php)
#
################################################################################
-LIB=${0/%cake/}
+LIB=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && LIB=$LIB/$(basename -- "$0")
+
+while [ -h "$LIB" ]; do
+ DIR=$(dirname -- "$LIB")
+ SYM=$(readlink "$LIB")
+ LIB=$(cd "$DIR" && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
+done
+
+LIB=$(dirname -- "$LIB")/
APP=`pwd`
-exec php -q ${LIB}cake.php -working "${APP}" "$@"
+exec php -q "$LIB"cake.php -working "$APP" "$@"
-exit;
+exit;
View
@@ -1,32 +1,32 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-:: Bake is a shell script for running CakePHP bake script
-:: PHP 5
-::
-:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
-:: Copyright 2005-2011, Cake Software Foundation, Inc.
-::
-:: Licensed under The MIT License
-:: Redistributions of files must retain the above copyright notice.
-::
-:: @copyright Copyright 2005-2011, Cake Software Foundation, Inc.
-:: @link http://cakephp.org CakePHP(tm) Project
-:: @package app.console
-:: @since CakePHP(tm) v 2.0
-:: @license MIT License (http://www.opensource.org/licenses/mit-license.php)
-::
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
-
-@echo.
-@echo off
-
-SET app=%0
-SET lib=%~dp0
-
-php -q "%lib%cake.php" -working "%CD% " %*
-
-echo.
-
-exit /B %ERRORLEVEL%
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Bake is a shell script for running CakePHP bake script
+:: PHP 5
+::
+:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+:: Copyright 2005-2011, Cake Software Foundation, Inc.
+::
+:: Licensed under The MIT License
+:: Redistributions of files must retain the above copyright notice.
+::
+:: @copyright Copyright 2005-2011, Cake Software Foundation, Inc.
+:: @link http://cakephp.org CakePHP(tm) Project
+:: @package app.Console
+:: @since CakePHP(tm) v 2.0
+:: @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
+
+@echo.
+@echo off
+
+SET app=%0
+SET lib=%~dp0
+
+php -q "%lib%cake.php" -working "%CD% " %*
+
+echo.
+
+exit /B %ERRORLEVEL%
View
@@ -2,5 +2,5 @@
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule ^(.*)$ index.php/$1 [QSA,L]
-</IfModule>
+ RewriteRule ^(.*)$ index.php?/$1 [QSA,L]
+</IfModule>
Oops, something went wrong.

0 comments on commit 92d0286

Please sign in to comment.