Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merging code from sandboxes since [430]

preparing for release .0.9.2

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@606 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
commit fbf4d9ee276c898f993e4082a38a6718a39dd5f8 1 parent 57ef2eb
@phpnut phpnut authored
Showing with 13,561 additions and 5,454 deletions.
  1. +185 −0 app/apis/my_acl.php
  2. +28 −16 app/app_controller.php
  3. +30 −18 app/app_model.php
  4. +31 −15 app/controllers/pages_controller.php
  5. +40 −19 app/controllers/tests_controller.php
  6. +30 −15 app/helpers/pages_helper.php
  7. +29 −14 app/helpers/tests_helper.php
  8. +3 −5 app/views/layouts/default.thtml
  9. +29 −36 app/views/pages/home.thtml
  10. +50 −0 config/acl.ini.php
  11. +40 −14 config/core.php
  12. +27 −11 config/paths.php
  13. +27 −11 config/routes.php
  14. +108 −0 config/tags.ini.php
  15. +0 −139 config/tags.php
  16. +24 −22 index.php
  17. +62 −0 libs/acl.php
  18. +19 −11 libs/{model_collection.php → acl_base.php}
  19. +28 −24 libs/bake.php
  20. +24 −23 libs/basics.php
  21. +38 −34 libs/cache.php
  22. +112 −0 libs/class_registry.php
  23. +652 −366 libs/controller.php
  24. 0  tests/app/models/put_model_tests_here → libs/controllers/templates/rescues/_request_and_response.thtml
  25. 0  tests/app/helpers/put_helper_tests_here → libs/controllers/templates/rescues/diagnostics.thtml
  26. 0  tests/app/controllers/put_controller_tests_here → libs/controllers/templates/rescues/layout.thtml
  27. 0  libs/controllers/templates/rescues/missing_template.thtml
  28. 0  libs/controllers/templates/rescues/routing_error.thtml
  29. 0  libs/controllers/templates/rescues/template_error.thtml
  30. 0  libs/controllers/templates/rescues/unknown_action.thtml
  31. +17 −94 libs/controllers/templates/scaffolds/edit.thtml
  32. +60 −99 libs/controllers/templates/scaffolds/list.thtml
  33. +6 −89 libs/controllers/templates/scaffolds/new.thtml
  34. +3 −2 libs/controllers/templates/scaffolds/scaffold.thtml
  35. +85 −83 libs/controllers/templates/scaffolds/show.thtml
  36. +40 −39 libs/dbo.php
  37. +98 −93 libs/dbo/dbo_adodb.php
  38. +37 −34 libs/dbo/dbo_generic.php
  39. +41 −35 libs/dbo/dbo_mysql.php
  40. +41 −35 libs/dbo/dbo_pear.php
  41. +40 −34 libs/dbo/dbo_postgres.php
  42. +31 −27 libs/dbo/dbo_sqlite.php
  43. +44 −37 libs/dbo_factory.php
  44. +36 −31 libs/dispatcher.php
  45. +37 −30 libs/error_messages.php
  46. +31 −27 libs/file.php
  47. +38 −35 libs/flay.php
  48. +42 −35 libs/folder.php
  49. +33 −0 libs/generator/base.php
  50. +33 −0 libs/generator/commands.php
  51. +33 −0 libs/generator/generators/applications/app/app_generator.php
  52. +33 −0 libs/generator/generators/components/controller/controller_generator.php
  53. +33 −0 libs/generator/generators/components/controller/templates/controller.php
  54. +33 −0 libs/generator/generators/components/controller/templates/functional_test.php
  55. +33 −0 libs/generator/generators/components/controller/templates/helper.php
  56. 0  libs/generator/generators/components/controller/templates/view.thtml
  57. +33 −0 libs/generator/generators/components/model/model_generator.php
  58. +33 −0 libs/generator/generators/components/model/templates/fixtures.php
  59. +33 −0 libs/generator/generators/components/model/templates/model.php
  60. +33 −0 libs/generator/generators/components/model/templates/unit_test.php
  61. +33 −0 libs/generator/generators/components/scaffold/scaffold_generator.php
  62. +33 −0 libs/generator/generators/components/scaffold/templates/controller.php
  63. 0  libs/generator/generators/components/scaffold/templates/form.thtml
  64. 0  libs/generator/generators/components/scaffold/templates/form_scaffolding.thtml
  65. +33 −0 libs/generator/generators/components/scaffold/templates/functional_test.php
  66. +33 −0 libs/generator/generators/components/scaffold/templates/helper.php
  67. 0  libs/generator/generators/components/scaffold/templates/layout.thtml
  68. 0  libs/generator/generators/components/scaffold/templates/style.css
  69. 0  libs/generator/generators/components/scaffold/templates/view_edit.thtml
  70. 0  libs/generator/generators/components/scaffold/templates/view_list.thtml
  71. 0  libs/generator/generators/components/scaffold/templates/view_new.thtml
  72. 0  libs/generator/generators/components/scaffold/templates/view_show.thtml
  73. +33 −0 libs/generator/generators/components/web/templates/api_definition.php
  74. +33 −0 libs/generator/generators/components/web/templates/controller.php
  75. +33 −0 libs/generator/generators/components/web/templates/functional_test.php
  76. +33 −0 libs/generator/generators/components/web/web_generator.php
  77. +33 −0 libs/generator/lookup.php
  78. +33 −0 libs/generator/manifest.php
  79. +33 −0 libs/generator/options.php
  80. +33 −0 libs/generator/scripts.php
  81. +33 −0 libs/generator/scripts/destroy.php
  82. +33 −0 libs/generator/scripts/generate.php
  83. +33 −0 libs/generator/scripts/update.php
  84. +33 −0 libs/generator/simple_logger.php
  85. +33 −0 libs/generator/spec.php
  86. +177 −0 libs/helper.php
  87. +31 −27 libs/helpers/acl.php
  88. +32 −28 libs/helpers/ajax.php
  89. +191 −67 libs/helpers/form.php
  90. +1,298 −614 libs/helpers/html.php
  91. +66 −0 libs/helpers/javascript.php
  92. +90 −0 libs/helpers/number.php
  93. +240 −0 libs/helpers/text.php
  94. +422 −0 libs/helpers/time.php
  95. +87 −66 libs/inflector.php
  96. +32 −33 libs/legacy.php
  97. +37 −30 libs/log.php
  98. +463 −340 libs/model.php
  99. +294 −290 libs/neat_array.php
  100. +92 −88 libs/neat_string.php
  101. +33 −27 libs/object.php
  102. +35 −31 libs/router.php
  103. +180 −35 libs/sanitize.php
  104. +182 −84 libs/scaffold.php
  105. +32 −26 libs/template.php
  106. +41 −36 libs/time.php
  107. +30 −29 libs/validators.php
  108. +39 −33 libs/view.php
  109. 0  libs/web/templates/scaffolds/layout.thtml
  110. 0  libs/web/templates/scaffolds/methods.thtml
  111. 0  libs/web/templates/scaffolds/parameters.thtml
  112. 0  libs/web/templates/scaffolds/result.thtml
  113. +25 −24 public/css.php
  114. +85 −82 public/css/default.css
  115. +19 −0 public/css/forms.css
  116. +131 −68 public/css/scaffold.css
  117. +30 −27 public/index.php
  118. +28 −22 public/js/vendors.php
  119. +29 −27 scripts/bake.php
  120. +31 −28 scripts/test.php
  121. +49 −0 tests/LICENSE.txt
  122. +30 −0 tests/README.txt
  123. +27 −0 tests/caketest.config.ini
  124. +45 −0 tests/caketest.config.php
  125. +44 −0 tests/cases/app/apis/apis.test.php
  126. +44 −0 tests/cases/app/app_controller.test.php
  127. +44 −0 tests/cases/app/app_model.test.php
  128. +44 −0 tests/cases/app/controllers/pages_controller.test..php
  129. +44 −0 tests/cases/app/helpers/pages_helper.test.php
  130. +44 −0 tests/cases/app/models/models.test.php
  131. +44 −0 tests/cases/app/views/errors/missing_action.test.php
  132. +44 −0 tests/cases/app/views/errors/missing_controller.test.php
  133. +44 −0 tests/cases/app/views/errors/missing_view.test.php
  134. +44 −0 tests/cases/app/views/layouts/ajax.test.php
  135. +44 −0 tests/cases/app/views/layouts/default.test.php
  136. +44 −0 tests/cases/app/views/layouts/error.test.php
  137. +44 −0 tests/cases/app/views/layouts/flash.test.php
  138. +44 −0 tests/cases/app/views/pages/home.test.php
  139. +45 −0 tests/cases/app/views/views.test.php
  140. +44 −0 tests/cases/config/core.test.php
  141. +44 −0 tests/cases/config/paths.test.php
  142. +44 −0 tests/cases/config/routes.test.php
  143. +44 −0 tests/cases/config/tags.test.php
  144. +44 −0 tests/cases/libs/bake.test.php
  145. +44 −0 tests/cases/libs/basics.test.php
  146. +44 −0 tests/cases/libs/cache.test.php
  147. +44 −0 tests/cases/libs/controller.test.php
  148. +44 −0 tests/cases/libs/controllers/templates/rescues/_request_and_response.test.php
  149. +44 −0 tests/cases/libs/controllers/templates/rescues/diagnostics.test.php
  150. +44 −0 tests/cases/libs/controllers/templates/rescues/layout.test.php
  151. +44 −0 tests/cases/libs/controllers/templates/rescues/missing_template.test.php
  152. +44 −0 tests/cases/libs/controllers/templates/rescues/routing_error.test.php
  153. +44 −0 tests/cases/libs/controllers/templates/rescues/template_error.test.php
  154. +44 −0 tests/cases/libs/controllers/templates/rescues/unknown_action.test.php
  155. +44 −0 tests/cases/libs/controllers/templates/scaffolds/edit.test.php
  156. +44 −0 tests/cases/libs/controllers/templates/scaffolds/list.test.php
  157. +44 −0 tests/cases/libs/controllers/templates/scaffolds/new.test.php
  158. +44 −0 tests/cases/libs/controllers/templates/scaffolds/scaffold.test.php
  159. +44 −0 tests/cases/libs/controllers/templates/scaffolds/show.test.php
  160. +44 −0 tests/cases/libs/dbo.test.php
  161. +44 −0 tests/cases/libs/dbo/dbo_adodb.test.php
  162. +44 −0 tests/cases/libs/dbo/dbo_generic.test.php
  163. +44 −0 tests/cases/libs/dbo/dbo_mysql.test.php
  164. +44 −0 tests/cases/libs/dbo/dbo_pear.test.php
  165. +44 −0 tests/cases/libs/dbo/dbo_postgres.test.php
  166. +44 −0 tests/cases/libs/dbo/dbo_sqlite.test.php
  167. +44 −0 tests/cases/libs/dbo_factory.test.php
  168. +44 −0 tests/cases/libs/dispatcher.test.php
  169. +44 −0 tests/cases/libs/error_messages.test.php
  170. +44 −0 tests/cases/libs/file.test.php
  171. +44 −0 tests/cases/libs/flay.test.php
  172. +44 −0 tests/cases/libs/folder.test.php
  173. +44 −0 tests/cases/libs/generator/base.test.php
  174. +44 −0 tests/cases/libs/generator/commands.test.php
  175. +44 −0 tests/cases/libs/generator/generators/applications/app/app_generator.php
  176. +44 −0 tests/cases/libs/generator/generators/components/controller/controller_generator.test.php
  177. +44 −0 tests/cases/libs/generator/generators/components/controller/templates/controller.test.php
  178. +44 −0 tests/cases/libs/generator/generators/components/controller/templates/functional_test.test.php
  179. +44 −0 tests/cases/libs/generator/generators/components/controller/templates/helper.test.php
  180. +44 −0 tests/cases/libs/generator/generators/components/controller/templates/view.test.php
  181. +44 −0 tests/cases/libs/generator/generators/components/model/model_generator.test.php
  182. +44 −0 tests/cases/libs/generator/generators/components/model/templates/fixtures.test.php
  183. +44 −0 tests/cases/libs/generator/generators/components/model/templates/model.test.php
  184. +44 −0 tests/cases/libs/generator/generators/components/model/templates/unit_test.test.php
  185. +44 −0 tests/cases/libs/generator/generators/components/scaffold/scaffold_generator.test.php
  186. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/controller.test.php
  187. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/form.test.php
  188. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/form_scaffolding.test.php
  189. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/functional_test.test.php
  190. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/helper.test.php
  191. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/layout.test.php
  192. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/view_edit.test.php
  193. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/view_list.test.php
  194. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/view_new.test.php
  195. +44 −0 tests/cases/libs/generator/generators/components/scaffold/templates/view_show.test.php
  196. +44 −0 tests/cases/libs/generator/generators/components/web/templates/api_definition.test.php
  197. +44 −0 tests/cases/libs/generator/generators/components/web/templates/controller.test.php
  198. +44 −0 tests/cases/libs/generator/generators/components/web/templates/functional_test.test.php
  199. +44 −0 tests/cases/libs/generator/generators/components/web/web_generator.test.php
  200. +44 −0 tests/cases/libs/generator/lookup.test.php
  201. +44 −0 tests/cases/libs/generator/manifest.test.php
  202. +44 −0 tests/cases/libs/generator/options.test.php
  203. +44 −0 tests/cases/libs/generator/scripts.test.php
  204. +44 −0 tests/cases/libs/generator/scripts/destroy.test.php
  205. +44 −0 tests/cases/libs/generator/scripts/generate.test.php
  206. +44 −0 tests/cases/libs/generator/scripts/update.test.php
  207. +44 −0 tests/cases/libs/generator/simple_logger.test.php
  208. +44 −0 tests/cases/libs/generator/spec.test.php
  209. +44 −0 tests/cases/libs/helper.test.php
  210. +44 −0 tests/cases/libs/helpers/acl.test.php
  211. +44 −0 tests/cases/libs/helpers/ajax.test.php
  212. +44 −0 tests/cases/libs/helpers/form.test.php
  213. +44 −0 tests/cases/libs/helpers/html.test.php
  214. +44 −0 tests/cases/libs/helpers/number.test.php
  215. +44 −0 tests/cases/libs/helpers/text.test.php
  216. +44 −0 tests/cases/libs/inflector.test.php
  217. +44 −0 tests/cases/libs/legacy.test.php
  218. +44 −0 tests/cases/libs/log.test.php
  219. +44 −0 tests/cases/libs/model.test.php
  220. +44 −0 tests/cases/libs/model_collection.test.php
  221. +44 −0 tests/cases/libs/neat_array.test.php
  222. +44 −0 tests/cases/libs/neat_string.test.php
  223. +44 −0 tests/cases/libs/object.test.php
  224. +44 −0 tests/cases/libs/router.test.php
  225. +44 −0 tests/cases/libs/sanitize.test.php
  226. +44 −0 tests/cases/libs/scaffold.test.php
  227. +44 −0 tests/cases/libs/template.test.php
  228. +44 −0 tests/cases/libs/time.test.php
  229. +44 −0 tests/cases/libs/validators.test.php
  230. +44 −0 tests/cases/libs/view.test.php
  231. +44 −0 tests/cases/libs/web/templates/scaffolds/layout.test.php
  232. +44 −0 tests/cases/libs/web/templates/scaffolds/methods.test.php
  233. +44 −0 tests/cases/libs/web/templates/scaffolds/parameters.test.php
  234. +44 −0 tests/cases/libs/web/templates/scaffolds/result.test.php
  235. +44 −0 tests/cases/logs/logs.test.php
  236. +44 −0 tests/cases/modules/modules.test.php
  237. +44 −0 tests/cases/public/css/css.test.php
  238. +44 −0 tests/cases/public/files/files.test.php
  239. +44 −0 tests/cases/public/img/img.test.php
  240. +44 −0 tests/cases/public/js/js.test.php
  241. +44 −0 tests/cases/public/public.test.php
  242. +44 −0 tests/cases/scripts/bake.bat.test.php
  243. +44 −0 tests/cases/scripts/bake.test.php
  244. +44 −0 tests/cases/scripts/cake_generator/generators/applications/app/cake_generator_applications_app.test.php
  245. +44 −0 tests/cases/scripts/cake_generator/generators/applications/cake_generator_applications.test.php
  246. +44 −0 tests/cases/scripts/cake_generator/scripts/cake_generator_scripts.test.php
  247. +44 −0 tests/cases/scripts/test.bat.test.php
  248. +44 −0 tests/cases/scripts/test.test.php
  249. +56 −0 tests/groups/AllButExamplesTest.group.php
  250. +0 −100 tests/libs/controller.php
  251. +0 −176 tests/libs/dbo.php
  252. +0 −133 tests/libs/dbo_factory.php
  253. +0 −156 tests/libs/flay.php
  254. +0 −262 tests/libs/folder.php
  255. +0 −409 tests/libs/helpers/html.php
  256. +0 −159 tests/libs/inflector.php
  257. +0 −115 tests/libs/neat_array.php
  258. +0 −130 tests/libs/router.php
  259. +36 −0 tests/menu.php
  260. +48 −0 tests/suite_libs/cake_web_test_case.php
  261. +44 −0 tests/suite_libs/test_manager.php
View
185 app/apis/my_acl.php
@@ -0,0 +1,185 @@
+<?php
+//////////////////////////////////////////////////////////////////////////
+// + $Id$
+// +------------------------------------------------------------------+ //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers + //
+// +------------------------------------------------------------------+ //
+// + Licensed under The MIT License + //
+//////////////////////////////////////////////////////////////////////////
+
+/**
+ *
+ * @filesource
+ * @package cake
+ * @subpackage cake.app.helpers
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
+ */
+
+uses('acl_base');
+
+/**
+ * In this file you can extend the AclBase.
+ *
+ * @package cake
+ * @subpackage cake.app.apis
+ */
+
+class MyACL extends AclBase
+{
+ /**
+ * The constructor must be overridden, as AclBase is abstract.
+ *
+ */
+ 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).
+ *
+ * @param string $aro
+ * @param string $aco
+ * @return boolean
+ */
+ function check($aro, $aco)
+ {
+ $aclConfig = $this->readConfigFile(CONFIGS . 'acl.ini.php');
+
+ //First, if the user is specifically denied, then DENY
+ if(isset($aclConfig[$aro]['deny']))
+ {
+ $userDenies = $this->arrayTrim(explode(",", $aclConfig[$aro]['deny']));
+ if (array_search($aco, $userDenies))
+ {
+ //echo "User Denied!";
+ return false;
+ }
+ }
+
+ //Second, if the user is specifically allowed, then ALLOW
+ if(isset($aclConfig[$aro]['allow']))
+ {
+ $userAllows = $this->arrayTrim(explode(",", $aclConfig[$aro]['allow']));
+ if (array_search($aco, $userAllows))
+ {
+ //echo "User Allowed!";
+ return true;
+ }
+ }
+
+ //Check group permissions
+ if (isset($aclConfig[$aro]['groups']))
+ {
+ $userGroups = $this->arrayTrim(explode(",", $aclConfig[$aro]['groups']));
+ foreach ($userGroups as $group)
+ {
+ //If such a group exists,
+ if(array_key_exists($group, $aclConfig))
+ {
+ //If the group is specifically denied, then DENY
+ if(isset($aclConfig[$group]['deny']))
+ {
+ $groupDenies = $this->arrayTrim(explode(",", $aclConfig[$group]['deny']));
+ if (array_search($aco, $groupDenies))
+ {
+ //echo("Group Denied!");
+ return false;
+ }
+ }
+
+ //If the group is specifically allowed, then ALLOW
+ if(isset($aclConfig[$group]['allow']))
+ {
+ $groupAllows = $this->arrayTrim(explode(",", $aclConfig[$group]['allow']));
+ if (array_search($aco, $groupAllows))
+ {
+ //echo("Group Allowed!");
+ return true;
+ }
+ }
+ }
+ }
+ }
+
+ //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.
+ *
+ * @param string $fileName
+ * @return array
+ */
+ function readConfigFile ($fileName)
+ {
+ $fileLineArray = file($fileName);
+
+ foreach ($fileLineArray as $fileLine)
+ {
+ $dataLine = trim($fileLine);
+ $firstChar = substr($dataLine, 0, 1);
+ if ($firstChar != ';' && $dataLine != '')
+ {
+ if ($firstChar == '[' && substr($dataLine, -1, 1) == ']')
+ {
+ $sectionName = preg_replace('/[\[\]]/', '', $dataLine);
+ }
+ else
+ {
+ $delimiter = strpos($dataLine, '=');
+ if ($delimiter > 0)
+ {
+ $key = strtolower(trim(substr($dataLine, 0, $delimiter)));
+ $value = trim(substr($dataLine, $delimiter + 1));
+ if (substr($value, 0, 1) == '"' && substr($value, -1) == '"')
+ {
+ $value = substr($value, 1, -1);
+ }
+ $iniSetting[$sectionName][$key] = stripcslashes($value);
+ }
+ else
+ {
+ if(!isset($sectionName))
+ {
+ $sectionName = '';
+ }
+ $iniSetting[$sectionName][strtolower(trim($dataLine))]='';
+ }
+ }
+ }
+ else
+ {
+ }
+ }
+ return $iniSetting;
+ }
+
+ /**
+ * Removes trailing spaces on all array elements (to prepare for searching)
+ *
+ * @param array $array
+ * @return array
+ */
+ function arrayTrim($array)
+ {
+ 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.
+ array_unshift($array, "");
+ return $array;
+ }
+
+}
+
+?>
View
44 app/app_controller.php
@@ -1,34 +1,46 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
+ * 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 <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>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @package cake
- * @subpackage cake.app
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.app
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
- * This file is application-wide controller file. You can put all
- * application-wide controller-related methods here.
+ * Short description for class.
*
* Add your application-wide methods in the class below, your controllers
* will inherit them.
*
- * @package cake
+ * @package cake
* @subpackage cake.app
*/
-
class AppController extends Controller {
}
View
48 app/app_model.php
@@ -1,34 +1,46 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
+ * 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 <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>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @package cake
- * @subpackage cake.app
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.app
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
-
+
/**
- * This file is application-wide model file. You can put all
- * application-wide model-related methods here.
- *
+ * Short description for class.
+ *
* Add your application-wide methods in the class below, your models
* will inherit them.
*
- * @package cake
+ * @package cake
* @subpackage cake.app
*/
-
class AppModel extends Model {
}
View
46 app/controllers/pages_controller.php
@@ -1,32 +1,48 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
-
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
+ * 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 <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>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @package cake
- * @subpackage cake.app.controllers
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.app.controllers
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
+
/**
+ * Short description for class.
+ *
* This file is application-wide controller file. You can put all
* application-wide controller-related methods here.
*
* Add your application-wide methods in the class below, your controllers
* will inherit them.
*
- * @package cake
+ * @package cake
* @subpackage cake.app.controllers
*/
class PagesController extends PagesHelper{
@@ -35,7 +51,7 @@ class PagesController extends PagesHelper{
* Enter description here...
*
* @var unknown_type
-*/
+ */
var $helpers = array('html', 'ajax');
View
59 app/controllers/tests_controller.php
@@ -1,39 +1,60 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
+ * Long description for file
+ *
+ * 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>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @package cake
- * @subpackage cake.app.controllers
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.app.controllers
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
+ * Short description for class.
*
- * @package cake
+ * Long description for class
+ *
+ * @package cake
* @subpackage cake.app.controllers
*/
class TestsController extends TestsHelper {
-
+
+ function index ()
+ {
+ $this->layout = null;
+ require_once TESTS.'menu.php';
+ }
/**
* Runs all library and application tests
*
*/
- function test_all ()
- {
- $this->layout = null;
- require_once SCRIPTS.'test.php';
- }
+// function test_all ()
+// {
+// $this->layout = null;
+// require_once SCRIPTS.'test.php';
+// }
}
?>
View
45 app/helpers/pages_helper.php
@@ -1,27 +1,42 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
+ * In this file you can extend the PagesController.
+ *
+ * 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>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @package cake
- * @subpackage cake.app.helpers
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.app.helpers
+ * @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 can extend the PagesController.
+ * Short description for class.
+ *
+ * Long description for class
*
- * @package cake
+ * @package cake
* @subpackage cake.app.helpers
*/
View
43 app/helpers/tests_helper.php
@@ -1,27 +1,42 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
+ * In this file you can extend the TestsController.
+ *
+ * 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>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
* @filesource
- * @package cake
- * @subpackage cake.app.helpers
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.app.helpers
+ * @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 can extend the TestsController.
+ * Short description for class.
+ *
+ * Long description for class
*
- * @package cake
+ * @package cake
* @subpackage cake.app.helpers
*/
View
8 app/views/layouts/default.thtml
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="pl" xml:lang="pl">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><?=$title_for_layout?></title>
<?=$html->charsetTag('UTF-8')?>
@@ -8,10 +8,8 @@
</head>
<body>
-<div id="container">
- <div id="content">
- <?=$content_for_layout?>
- </div>
+<div id="main">
+<?=$content_for_layout?>
</div>
</body>
</html>
View
65 app/views/pages/home.thtml
@@ -1,36 +1,29 @@
-<h1>Cake PHP works!</h1>
-
-<p>Your installation of Cake PHP is functional. Edit <code>/app/views/pages/home.thtml</code> to change the contents of this page.</p>
-
-<h2>Introducing Cake PHP</h2>
-
-<p>Cake is a structure of libraries, classes and run-time infrastructure for PHP programmers. It's also what It's original author, Michal uses at work. It's based on certain conventions, so you may find it rigid at first. The directory structure is already laid out, and it's different from what most people use. From what We've experienced, a great many PHP programmers start as web- or graphic-designers, i.e. they are not university-educated programmers as many in C++ and Java-land. They invent their own, peculiar ways of solving problems and stick to them. Perhaps that's why so few people use <?=$html->linkOut('PEAR', 'http://pear.php.net')?> and <?=$html->linkOut('PECL', 'http://pecl.php.net')?> libraries &ndash; they don't usually re-use their code.</p>
-
-<p>Cake PHP builds on a concept introduced in <?=$html->linkOut('Ruby on Rails', 'http://rubyonrails.com')?> &ndash; it enables rapid developement of feature-rich websites.</p>
-
-<h2>Features</h2>
-
-<ul>
- <li>Compatibile with PHP4 and PHP5.</li>
- <li>Supplies integrated <acronym title="Create, Read, Update, Delete">CRUD</acronym> for databases.</li>
- <li>Pretty URL's that work with and without mod_rewrite.</li>
- <li>Fast, flexible templating (PHP syntax with helper methods).</li>
- <li>Suported database-types: MySQL, PostgreSQL and SQLIte</li>
- <li>Suported webservers: Apache (others will most likely also work)</li>
-</ul>
-
-<p>Cake is still in its early infancy, but we are proceeding in good direction &ndash; table joins will most probably get added in 0.9.3 release, and better support for user-defined settings is also underway.</p>
-
-<h2>Getting involved</h2>
-
-<p>Cake PHP needs you! We have already quiet active user base, but we are allways open to new bug reports or feature ideas!</p>
-
-<ul>
- <li><?=$html->linkOut('Google Group','http://groups-beta.google.com/group/cake-php')?> &ndash; for public discussions about everything Cake.</li>
- <li><?=$html->linkOut('Wiki','https://trac.cakephp.org/wiki')?> &ndash; fastest way of getting newest information on Cake PHP.</li>
- <li><?=$html->linkOut('Report a bug or feature request','https://trac.cakephp.org/newticket')?>.</li>
- <li><?=$html->linkOut('Roadmap','https://trac.cakephp.org/roadmap')?> &ndash; check our plans for the bright future.</li>
-</ul>
-
-<p>Soon there will be oficial <?=$html->linkOut('Cake PHP website','http://www.cakephp.org/')?>, so stay tuned.</p>
-<p>Also see Cake PHP's original authors <?=$html->linkOut('Amazon wishlish','http://www.amazon.com/gp/registry/registry.html?id=NODP8QT6LFTO')?> if you want to show appreciation for his work on the project.</p>
+<h1>CakePHP <em>Works!</em></h1><br/>
+<hr/>
+Your database configuration file is <?= file_exists(CONFIGS.'database.php') ? 'present.'. $filePresent = ' ' : 'not present.';?><br/>
+<? $db = DboFactory::getInstance(); ?>
+<? if (!empty($filePresent)):?>
+Cake <?=$db->connected ? "is able to" : "is not able to" ?> connect to the database.
+<?endif?>
+<hr/>
+<br/>
+<h2>Editing <em>this Page</em></h2>
+<p>
+To change the content of this page, edit <code>/app/views/pages/home.thtml</code>. To change it's layout, edit <code>/app/views/layouts/default.thtml</code>. You can also edit the CSS styles for this page at <code>/public/css/default.css</code>.
+</p><br/>
+
+<h2>Introducing <em>Cake</em></h2>
+
+<p>Cake is a rapid development framework for PHP: a structure of libraries, classes and run-time infrastructure for programmers creating web applications. Our primary goal is to enable you to work in a structured and rapid manner within a framework - without loss of flexibility. </p><br/>
+<p>Tired of repeating yourself? Ever copy and pasted code? Want to get your app in production quicker? Cake is for you. </p><br/>
+
+<h2>Get <em>Involved</em></h2>
+<p>Cake PHP needs you! We have an active user base and are always open to new bug reports or feature ideas!</p><br/>
+<?=$html->linkOut('Google Group','http://groups-beta.google.com/group/cake-php')?> &ndash; for public discussions about everything Cake.<br/>
+<?=$html->linkOut('Wiki','https://trac.cakephp.org/wiki')?> &ndash; fastest way of getting newest information on Cake PHP.<br/>
+<?=$html->linkOut('Report a bug or feature request','https://trac.cakephp.org/newticket')?>.<br/>
+<?=$html->linkOut('Roadmap','https://trac.cakephp.org/roadmap')?> &ndash; check our plans for the bright future.<br/>
+#cakephp on irc.euirc.net for quick help<br/>
+</p>
+<br/>
+<p>Cake 0.9.2</p>
View
50 config/acl.ini.php
@@ -0,0 +1,50 @@
+<? die(); ?>
+
+; acl.ini.php - Cake ACL Configuration
+; ---------------------------------------------------------------------
+; 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]
+; groups = group1, group2, group3
+; allow = aco1, aco2, aco3
+; 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!
+;
+; ACL permissions are checked in the following order:
+; 1. Check for user denies (and DENY if specified)
+; 2. Check for user allows (and ALLOW if specified)
+; 3. Gather user's groups
+; 4. Check group denies (and DENY if specified)
+; 5. Check group allows (and ALLOW if specified)
+; 6. If no aro, aco, or group information is found, DENY
+;
+; ---------------------------------------------------------------------
+
+;-------------------------------------
+;Users
+;-------------------------------------
+
+[username-goes-here]
+groups = group1, group2
+deny = aco1, aco2
+allow = aco3, aco4
+
+;-------------------------------------
+;Groups
+;-------------------------------------
+
+[groupname-goes-here]
+deny = aco5, aco6
+allow = aco7, aco8
View
54 config/core.php
@@ -1,19 +1,34 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
- * This is core configuration file. Use it to configure core behaviour of
- * Cake.
+ * This is core configuration file.
*
- * @package cake
- * @subpackage cake.config
+ * 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>
+ *
+ * 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
+ * @package cake
+ * @subpackage cake.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
*/
/**
@@ -22,13 +37,24 @@
* - 1: development
* - 2: full debug with sql
*/
-define ('DEBUG', 1);
+define('DEBUG', 1);
/**
* 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);
+
+/**
+ * To use Access Control Lists with Cake...
+ */
+define('ACL_CLASSNAME', 'MyACL');
+define('ACL_FILENAME', 'my_acl.php');
?>
View
38 config/paths.php
@@ -1,18 +1,34 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
- * In this file you set paths to different directories used by Cake.
+ * Short description for file.
*
- * @package cake
- * @subpackage cake.config
+ * In this file you set paths to different directories used by Cake.
+ *
+ * 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>
+ *
+ * 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
+ * @package cake
+ * @subpackage cake.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
*/
/**
View
38 config/routes.php
@@ -1,20 +1,36 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
* In this file, you set up routes to your controllers and their actions.
* Routes are very important mechanism that allows you to freely connect
* different urls to chosen controllers and their actions (functions).
- *
- * @package cake
- * @subpackage cake.config
+ *
+ * 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>
+ *
+ * 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
+ * @package cake
+ * @subpackage cake.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
*/
/**
View
108 config/tags.ini.php
@@ -0,0 +1,108 @@
+;<?php die() ?>
+; SVN FILE: $Id$
+;/**
+; * Short description for file.
+; *
+; * In this file, you can set up 'templates' for every tag generated by the tag
+; * generator.
+; *
+; * 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>
+; *
+; * 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
+; * @package cake
+; * @subpackage cake.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
+; */
+
+
+; Tag template for a link.
+link = "<a href="%s"%s>%s</a>"
+
+; Tag template for a mailto: link.
+mailto = "<a href="mailto:%s"%s>%s</a>"
+
+; Tag template for opening form tag.
+form = "<form %s>"
+
+; Tag template for an input type='text' tag.
+input = "<input name="data[%s][%s]"%s/>"
+
+; Tag template for an input type='textarea' tag
+textarea = "<textarea name="data[%s][%s]"%s>%s</textarea>"
+
+; Tag template for an input type='hidden' tag.
+hidden = "<input type="hidden" name="data[%s][%s]"%s/>"
+
+; Tag template for a textarea tag.
+textarea = "<textarea name="data[%s][%s]"%s>%s</textarea>"
+
+; Tag template for a input type='checkbox ' tag.
+checkbox = "<input type="checkbox" name="data[%s][%s]" id="tag_%s"%s/>"
+
+; Tag template for a input type='radio' tag.
+radio = "<input type="radio" name="data[%s][%s]" id="tag_%s"%s/>"
+
+; Tag template for a select opening tag.
+selectStart = "<select name="data[%s][%s]"%s>"
+
+; Tag template for an empty select option tag.
+selectEmpty = "<option value=""%s></option>"
+
+; Tag template for a select option tag.
+selectOption = "<option value="%s"%s>%s</option>"
+
+; Tag template for a closing select tag.
+selectEnd = "</select>"
+
+; Tag template for a password tag.
+password = "<input type="password" name="data[%s][%s]"%s/>"
+
+; Tag template for a file input tag.
+file = "<input type="file" name="%s"%s/>"
+
+; Tag template for a submit button tag.
+submit = "<input type="submit"%s/>"
+
+; Tag template for an image tag.
+image =" <img src="%s"%s/>"
+
+; Tag template for a table header tag.
+tableHeader = "<th%s>%s</th>"
+
+; Tag template for table headers row tag.
+tableHeaderRow = "<tr%s>%s</tr>"
+
+; Tag template for a table cell tag.
+tableCell = "<td%s>%s</td>"
+
+; Tag template for a table row tag.
+tableRow = "<tr%s>%s</tr>"
+
+; Tag template for a CSS link tag.
+css = "<link rel="%s" type="text/css" href="%s" />"
+
+; Tag template for a charset meta-tag.
+charset = "<meta http-equiv="Content-Type" content="text/html; charset=%s" />"
+
+; Tag template for inline JavaScript.
+javascriptBlock = "<script type="text/javascript">%s</script>"
+
+; Tag template for included JavaScript.
+javascriptLink = "<script type="text/javascript" src="%s"></script>"
View
139 config/tags.php
@@ -1,139 +0,0 @@
-<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, CakePHP Authors/Developers + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-//////////////////////////////////////////////////////////////////////////
-
-/**
- * In this file, you can set up 'templates' for every tag generated by the tag
- * generator.
- *
- * @package cake
- * @subpackage cake.config
- */
-
-/**
- * Tag template for a link.
- */
-define('TAG_LINK', '<a href="%s"%s>%s</a>');
-
-/**
- * Tag template for a mailto: link.
- */
-define('TAG_MAILTO', '<a href="mailto:%s"%s>%s</a>');
-
-/**
- * Tag template for opening form tag.
- */
-define('TAG_FORM', '<form %s>');
-
-/**
- * Tag template for an input type='text' tag.
- */
-define('TAG_INPUT', '<input name="data[%s][%s]" %s/>');
-
-/**
- * Tag template for an input type='hidden' tag.
- */
-define('TAG_HIDDEN', '<input type="hidden" name="data[%s][%s]" %s/>');
-
-/**
- * Tag template for a textarea tag.
- */
-define('TAG_AREA', '<textarea name="data[%s][%s]"%s>%s</textarea>');
-
-/**
- * Tag template for a input type='checkbox ' tag.
- */
-define('TAG_CHECKBOX', '<label for="tag_%s"><input type="checkbox" name="data[%s][%s]" id="tag_%s" %s/>%s</label>');
-
-/**
- * Tag template for a input type='radio' tag.
- */
-define('TAG_RADIOS', '<label for="tag_%s"><input type="radio" name="data[%s][%s]" id="tag_%s" %s/>%s</label>');
-
-/**
- * Tag template for a select opening tag.
- */
-define('TAG_SELECT_START', '<select name="data[%s][%s]"%s>');
-
-/**
- * Tag template for an empty select option tag.
- */
-define('TAG_SELECT_EMPTY', '<option value=""%s></option>');
-
-/**
- * Tag template for a select option tag.
- */
-define('TAG_SELECT_OPTION','<option value="%s"%s>%s</option>');
-
-/**
- * Tag template for a closing select tag.
- */
-define('TAG_SELECT_END', '</select>');
-
-/**
- * Tag template for a password tag.
- */
-define('TAG_PASSWORD', '<input type="password" name="data[%s][%s]" %s/>');
-
-/**
- * Tag template for a file input tag.
- */
-define('TAG_FILE', '<input type="file" name="%s" %s/>');
-
-/**
- * Tag template for a submit button tag.
- */
-define('TAG_SUBMIT', '<input type="submit" %s/>');
-
-/**
- * Tag template for an image tag.
- */
-define('TAG_IMAGE', '<img src="%s" alt="%s" %s/>');
-
-/**
- * Tag template for a table header tag.
- */
-define('TAG_TABLE_HEADER', '<th%s>%s</th>');
-
-/**
- * Tag template for table headers row tag.
- */
-define('TAG_TABLE_HEADERS','<tr%s>%s</tr>');
-
-/**
- * Tag template for a table cell tag.
- */
-define('TAG_TABLE_CELL', '<td%s>%s</td>');
-
-/**
- * Tag template for a table row tag.
- */
-define('TAG_TABLE_ROW', '<tr%s>%s</tr>');
-
-/**
- * Tag template for a CSS link tag.
- */
-define('TAG_CSS', '<link rel="%s" type="text/css" href="%s" />');
-
-/**
- * Tag template for a charset meta-tag.
- */
-define('TAG_CHARSET', '<meta http-equiv="Content-Type" content="text/html; charset=%s" />');
-
-/**
- * Tag template for inline JavaScript.
- */
-define('TAG_JAVASCRIPT', '<script language="javascript" type="text/javascript">%s</script>');
-
-/**
- * Tag template for included JavaScript.
- */
-define('TAG_JAVASCRIPT_INCLUDE', '<script language="javascript" type="text/javascript" src="%s"></script>');
-
-?>
View
46 index.php
@@ -1,33 +1,35 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : 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> + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-// + Redistributions of files must retain the above copyright notice. + //
-// + See: http://www.opensource.org/licenses/mit-license.php + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
* This file collects requests if:
* - no mod_rewrite is avilable or .htaccess files are not supported
* - /public is not set as a web root.
- *
+ *
+ * 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>
+ *
+ * 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
- * @package cake
- * @since CakePHP v 0.2.9
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
View
62 libs/acl.php
@@ -0,0 +1,62 @@
+<?php
+/* SVN FILE: $Id$ */
+
+/**
+ * Access Control List.
+ *
+ * Long description for file
+ *
+ * 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>
+ *
+ * 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
+ * @package cake
+ * @subpackage cake.libs.helpers
+ * @since CakePHP v 0.9.2
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+/**
+ * Access Control List factory class.
+ *
+ * Looks for ACL implementation class in core config, and returns an instance of that class.
+ *
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.9.2
+ *
+ */
+class Acl
+{
+
+ /**
+ * Static function used to gain an instance of the correct ACL class.
+ *
+ * @return MyACL
+ */
+ function getACL()
+ {
+ require_once(CONFIGS.'core.php');
+ require_once(APP.'apis'.DS.ACL_FILENAME);
+
+ $myacl = ACL_CLASSNAME;
+ return new $myacl;
+ }
+
+}
+?>
View
30 libs/model_collection.php → libs/acl_base.php
@@ -14,7 +14,7 @@
//////////////////////////////////////////////////////////////////////////
/**
- * Model Collections.
+ * Access Control List.
*
* @filesource
* @author CakePHP Authors/Developers
@@ -30,24 +30,32 @@
*
*/
+uses('error_messages');
+
/**
- * Model Collections.
+ * Access Control List abstract class. Not to be instantiated.
+ * Subclasses of this class are used by AclHelper to perform ACL checks in Cake.
*
* @package cake
- * @subpackage cake.libs
+ * @subpackage libs
* @since CakePHP v 0.9.2
*
*/
- class ModelCollection
+class AclBase
+{
+
+ function AclBase()
{
-
-/**
- * Enter description here...
- *
- * @return ModelCollection
- */
- function ModelCollection()
+ //No instantiations or constructor calls (even statically)
+ if (strcasecmp(get_class($this), "AclBase") == 0 || !is_subclass_of($this, "AclBase"))
{
+ trigger_error(ERROR_ABSTRACT_CONSTRUCTION, E_USER_ERROR);
+ return NULL;
}
+
}
+
+ function check($aro, $aco) {}
+
+}
?>
View
52 libs/bake.php
@@ -1,33 +1,35 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : 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> + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-// + Redistributions of files must retain the above copyright notice. + //
-// + See: http://www.opensource.org/licenses/mit-license.php + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
+ * Short description for file.
+ *
* Creates controller, model, view files, and the required directories on demand.
* Used by /scripts/bake.php.
*
+ * 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>
+ *
+ * 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
- * @package cake
- * @subpackage cake.libs
- * @since CakePHP v 0.2.9
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
@@ -36,12 +38,14 @@
uses('object', 'inflector');
/**
+ * Short description for class.
+ *
* Bake class creates files in configured application directories. This is a
* base class for /scripts/add.php.
*
- * @package cake
+ * @package cake
* @subpackage cake.libs
- * @since CakePHP v 0.2.9
+ * @since CakePHP v 0.2.9
*/
class Bake extends Object {
View
47 libs/basics.php
@@ -1,33 +1,34 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : 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> + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-// + Redistributions of files must retain the above copyright notice. + //
-// + See: http://www.opensource.org/licenses/mit-license.php + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
* Basic Cake functionalities.
*
+ * Long description for file
+ *
+ * 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>
+ *
+ * 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
- * @package cake
- * @subpackage cake.libs
- * @since CakePHP v 0.2.9
- * @version $Revision$
- * @modifiedby $LastChangedBy$
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
* @lastmodified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
- *
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
View
72 libs/cache.php
@@ -1,34 +1,36 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : 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> + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-// + Redistributions of files must retain the above copyright notice. + //
-// + See: http://www.opensource.org/licenses/mit-license.php + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
- * Purpose: Cache
- * Description:
- *
- * @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
- * @package cake
- * @subpackage cake.libs
- * @since CakePHP v 0.2.9
- * @version $Revision$
- * @modifiedby $LastChangedBy$
- * @lastmodified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
- */
+ * Cache
+ *
+ * Long description for file
+ *
+ * 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>
+ *
+ * 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
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
/**
* Enter description here...
@@ -37,12 +39,14 @@
uses('model');
/**
- * Enter description here...
- *
- * @package cake
- * @subpackage cake.libs
- * @since CakePHP v 0.2.9
- */
+ * Short description for class.
+ *
+ * Long description for class
+ *
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.2.9
+ */
class Cache extends Model {
/**
View
112 libs/class_registry.php
@@ -0,0 +1,112 @@
+<?php
+/* SVN FILE: $Id$ */
+
+/**
+ * Short description for file.
+ *
+ * Long description for file
+ *
+ * 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>
+ *
+ * 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
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.9.2
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+/**
+ * Class Collections.
+ *
+ * Long description for class
+ *
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.9.2
+ */
+ class ClassRegistry
+ {
+
+/**
+ * Enter description here...
+ *
+ * @var unknown_type
+ * @access private
+ */
+ var $_objects = array();
+
+/**
+ * Enter description here...
+ *
+ * @return ClassRegistry instance
+ */
+ function &getInstance() {
+
+ static $instance = array();
+ if (!$instance)
+ {
+ $instance[0] =& new ClassRegistry;
+ }
+ return $instance[0];
+ }
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $key
+ * @param unknown_type $object
+ */
+ function addObject($key, &$object)
+ {
+ $key = strtolower($key);
+
+ if (array_key_exists($key, $this->_objects) === false)
+ {
+ $this->_objects[$key] =& $object;
+ }
+ }
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $key
+ * @return unknown
+ */
+ function isKeySet($key)
+ {
+ $key = strtolower($key);
+ return array_key_exists($key, $this->_objects);
+ }
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $key
+ * @return unknown
+ */
+ function &getObject($key)
+ {
+ $key = strtolower($key);
+ return $this->_objects[$key];
+ }
+
+
+ }
+
+?>
View
1,018 libs/controller.php
@@ -1,397 +1,683 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-// + $Id$
-// +------------------------------------------------------------------+ //
-// + Cake PHP : 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> + //
-// +------------------------------------------------------------------+ //
-// + Licensed under The MIT License + //
-// + Redistributions of files must retain the above copyright notice. + //
-// + See: http://www.opensource.org/licenses/mit-license.php + //
-//////////////////////////////////////////////////////////////////////////
+/* SVN FILE: $Id$ */
/**
- * Purpose: Controller
- * Application controller (controllers are where you put all the actual code)
- * Provides basic functionality, such as rendering views (aka displaying templates).
- * Automatically selects model name from on singularized object class name
- * and creates the model object if proper class exists.
+ * Short description for file.
*
- * @filesource
- * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, CakePHP Authors/Developers
- * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
- * @package cake
- * @subpackage cake.libs
- * @since CakePHP v 0.2.9
- * @version $Revision$
- * @modifiedby $LastChangedBy$
- * @lastmodified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
- *
- */
-
-/**
- * Enter description here...
- */
-uses('model', 'inflector', 'folder', 'view');
-
-/**
- * Enter description here...
+ * Long description for file
*
- * @package cake
- * @subpackage cake.libs
- * @since CakePHP v 0.2.9
+ * PHP versions 4 and 5
*
- */
-class Controller extends Object
-{
-/**
- * Name of the controller.
+ * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright (c) 2005, CakePHP Authors/Developers
*
- * @var unknown_type
- * @access public
- */
- var $name = null;
-
-/**
- * Stores the current URL (for links etc.)
+ * 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>
*
- * @var string Current URL
- */
- var $here = null;
-
-/**
- * Enter description here...
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
*
- * @var unknown_type
- * @access public
- */
- var $parent = null;
-
-/**
- * Action to be performed.
- *
- * @var string
- * @access public
- */
- var $action = null;
-
-/**
- * An array of names of models the particular controller wants to use.
- *
- * @var mixed A single name as a string or a list of names as an array.
- * @access protected
- */
- var $uses = false;
-
-/**
- * An array of names of built-in helpers to include.
- *
- * @var mixed A single name as a string or a list of names as an array.
- * @access protected
- */
- var $helpers = array('html');
-
- var $viewPath;
-
-/**
- * Variables for the view
- *
- * @var array
- * @access private
- */
- var $_viewVars = array();
-
-/**
- * Enter description here...
- *
- * @var boolean
- * @access private
- */
- var $pageTitle = false;
-
-/**
- * An array of model objects.
- *
- * @var array Array of model objects.
- * @access public
+ * @filesource
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
- var $models = array();
-
/**
* Enter description here...
- *
- * @var unknown_type
- * @access public
*/
- var $base = null;
+uses('model', 'inflector', 'folder', 'view', 'helper