Permalink
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...
1 parent 57ef2eb commit fbf4d9ee276c898f993e4082a38a6718a39dd5f8 @phpnut phpnut committed Aug 21, 2005
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 ...ollers/put_controller_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/models/put_model_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 ...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
@@ -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
@@ -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
@@ -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 {
}
@@ -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');
Oops, something went wrong.

0 comments on commit fbf4d9e

Please sign in to comment.