From d62b9ec65e7fc20a817c3e35e7d52f7b45445436 Mon Sep 17 00:00:00 2001 From: phpnut Date: Sun, 9 Oct 2005 01:56:21 +0000 Subject: [PATCH] Merging from sandboxes [1079] Merged [1005] committed by nate but not added to core prior to release. Merged [1078] prior to modifying all developers sandboxes. [1081] adding view and template directories [1082] adding base files for view generator [1083] correcting all package and sub package tags for in doc blocks. Making sure every file in the core has doc block in them [1084] renaming working copy of latest release [1093] Added fix for associations using underscores if var $useTable is set in the associated models. This closes ticket #11. [1094] Fix for Ticket #24. The problem was tracked to a variable in View::_render(); $loadedHelpers was being assigned a reference when it when it should not have been. [1096] Initial work on controller components needs testing. Also added a work around for the basics.php uses(). Using the define DS where the files from the original version are now located in deeper libs directories. [1097] committing a few typos in the code I added [1098] reformatting code in component.php [1104] changed the test route and corrected a regex in inflector. [1111] removing the contructor from dispatcher, it is not needed [1112] Changes made for errors when a file is not present in webroot. Fixed the regex used in Router::parse(). Change the error layout template. [1113] Changes to Folder class to allow setting the permissions mode when constructing. This class needs to be refactored and move everything that is in the contructor out. The constructor should set the vars for use in other Folder::"methods"(). Will work on this at a later time. git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1114 3807eeeb-6ff5-0310-8944-8be069107fe0 --- app/config/acl.ini.php | 31 +++- app/config/core.php | 2 +- app/config/database.php.default | 39 +++-- app/config/paths.php | 11 +- app/config/routes.php | 4 +- app/config/routes.php.default | 41 ++++-- app/config/tags.ini.php | 4 +- app/controllers/components/my_acl.php | 43 ++++-- app/index.php | 4 +- app/webroot/css.php | 2 +- app/webroot/index.php | 2 +- cake/app_controller.php | 2 +- cake/app_model.php | 2 +- cake/basics.php | 39 ++++- cake/dispatcher.php | 20 ++- cake/libs/cache.php | 6 +- cake/libs/class_registry.php | 4 +- cake/libs/controller/component.php | 134 ++++++++++++++++++ cake/libs/controller/components/acl.php | 13 +- cake/libs/controller/components/acl_base.php | 10 +- cake/libs/controller/controller.php | 18 ++- cake/libs/controller/pages_controller.php | 4 +- cake/libs/controller/scaffold.php | 10 +- .../controller/templates/scaffolds/edit.thtml | 31 ++++ .../controller/templates/scaffolds/list.thtml | 32 +++++ .../controller/templates/scaffolds/new.thtml | 31 ++++ .../templates/scaffolds/scaffold.thtml | 31 ++++ .../controller/templates/scaffolds/show.thtml | 33 +++++ cake/libs/error_messages.php | 2 +- cake/libs/file.php | 4 +- cake/libs/flay.php | 4 +- cake/libs/folder.php | 11 +- cake/libs/generator/bake.php | 6 +- cake/libs/generator/base.php | 46 +++--- cake/libs/generator/commands.php | 46 +++--- .../applications/app/app_generator.php | 46 +++--- .../controller/controller_generator.php | 46 +++--- .../controller/templates/component.php | 35 +++++ .../controller/templates/controller.php | 46 +++--- .../controller/templates/functional_test.php | 46 +++--- .../controller/templates/helper.php | 33 ----- .../controller/templates/view.thtml | 0 .../class_templates/model/model_generator.php | 46 +++--- .../model/templates/fixtures.php | 46 +++--- .../class_templates/model/templates/model.php | 46 +++--- .../model/templates/unit_test.php | 46 +++--- .../scaffold/scaffold_generator.php | 46 +++--- .../scaffold/templates/controller.php | 46 +++--- .../scaffold/templates/form.thtml | 35 +++++ .../scaffold/templates/form_scaffolding.thtml | 35 +++++ .../scaffold/templates/functional_test.php | 46 +++--- .../scaffold/templates/helper.php | 46 +++--- .../scaffold/templates/layout.thtml | 35 +++++ .../scaffold/templates/view_edit.thtml | 35 +++++ .../scaffold/templates/view_list.thtml | 35 +++++ .../scaffold/templates/view_new.thtml | 35 +++++ .../scaffold/templates/view_show.thtml | 35 +++++ .../class_templates/view/templates/helper.php | 35 +++++ .../class_templates/view/templates/view.thtml | 31 ++++ .../class_templates/view/view_generator.php | 35 +++++ .../web/templates/api_definition.php | 46 +++--- .../web/templates/controller.php | 46 +++--- .../web/templates/functional_test.php | 46 +++--- .../class_templates/web/web_generator.php | 46 +++--- cake/libs/generator/lookup.php | 46 +++--- cake/libs/generator/manifest.php | 46 +++--- cake/libs/generator/options.php | 46 +++--- cake/libs/generator/scripts.php | 46 +++--- cake/libs/generator/scripts/destroy.php | 46 +++--- cake/libs/generator/scripts/generate.php | 46 +++--- cake/libs/generator/scripts/update.php | 46 +++--- cake/libs/generator/simple_logger.php | 46 +++--- cake/libs/generator/spec.php | 46 +++--- cake/libs/inflector.php | 8 +- cake/libs/legacy.php | 2 +- cake/libs/log.php | 4 +- cake/libs/model/dbo/dbo.php | 4 +- cake/libs/model/dbo/dbo_adodb.php | 4 +- cake/libs/model/dbo/dbo_factory.php | 8 +- cake/libs/model/dbo/dbo_generic.php | 4 +- cake/libs/model/dbo/dbo_mysql.php | 4 +- cake/libs/model/dbo/dbo_pear.php | 4 +- cake/libs/model/dbo/dbo_postgres.php | 4 +- cake/libs/model/dbo/dbo_sqlite.php | 4 +- cake/libs/model/model.php | 37 ++--- cake/libs/neat_array.php | 4 +- cake/libs/neat_string.php | 4 +- cake/libs/new_inflector.php | 4 +- cake/libs/object.php | 4 +- cake/libs/router.php | 8 +- cake/libs/sanitize.php | 8 +- cake/libs/time.php | 4 +- cake/libs/validators.php | 2 +- cake/libs/view/helper.php | 4 +- cake/libs/view/helpers/acl.php | 8 +- cake/libs/view/helpers/ajax.php | 8 +- cake/libs/view/helpers/form.php | 8 +- cake/libs/view/helpers/html.php | 4 +- cake/libs/view/helpers/javascript.php | 16 +-- cake/libs/view/helpers/number.php | 8 +- cake/libs/view/helpers/text.php | 10 +- cake/libs/view/helpers/time.php | 24 +++- .../templates/errors/missing_action.thtml | 33 +++++ .../templates/errors/missing_controller.thtml | 33 +++++ .../templates/errors/missing_database.thtml | 33 +++++ .../errors/missing_helper_class.thtml | 37 ++++- .../errors/missing_helper_file.thtml | 37 ++++- .../templates/errors/missing_scaffolddb.thtml | 33 +++++ .../view/templates/errors/missing_table.thtml | 33 +++++ .../view/templates/errors/missing_view.thtml | 33 +++++ cake/libs/view/templates/layouts/ajax.thtml | 33 +++++ .../libs/view/templates/layouts/default.thtml | 33 +++++ cake/libs/view/templates/layouts/error.thtml | 79 ++++++++++- cake/libs/view/templates/layouts/flash.thtml | 33 +++++ cake/libs/view/templates/pages/home.thtml | 33 +++++ cake/libs/view/view.php | 35 +++-- cake/scripts/bake.php | 2 +- cake/scripts/test.php | 2 +- 118 files changed, 2180 insertions(+), 843 deletions(-) create mode 100644 cake/libs/controller/component.php create mode 100644 cake/libs/generator/generators/class_templates/controller/templates/component.php delete mode 100644 cake/libs/generator/generators/class_templates/controller/templates/helper.php delete mode 100644 cake/libs/generator/generators/class_templates/controller/templates/view.thtml create mode 100644 cake/libs/generator/generators/class_templates/view/templates/helper.php create mode 100644 cake/libs/generator/generators/class_templates/view/templates/view.thtml create mode 100644 cake/libs/generator/generators/class_templates/view/view_generator.php diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php index 0940ec8a8..965aa8891 100644 --- a/app/config/acl.ini.php +++ b/app/config/acl.ini.php @@ -1,4 +1,33 @@ - +; +; SVN FILE: $Id$ +;/** +; * Short description for file. +; * +; * +; * PHP versions 4 and 5 +; * +; * CakePHP : Rapid Development Framework +; * Copyright (c) 2005, CakePHP Authors/Developers +; * +; * Author(s): Michal Tatarynowicz aka Pies +; * Larry E. Masters aka PhpNut +; * Kamil Dzielinski aka Brego +; * +; * 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.cake.app.config +; * @since CakePHP v 0.10.0.1076 +; * @version $Revision$ +; * @modifiedby $LastChangedBy$ +; * @lastmodified $Date$ +; * @license http://www.opensource.org/licenses/mit-license.php The MIT License +; */ ; acl.ini.php - Cake ACL Configuration ; --------------------------------------------------------------------- diff --git a/app/config/core.php b/app/config/core.php index a2b2b046f..4e9048054 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.config + * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/app/config/database.php.default b/app/config/database.php.default index 74ed2ea03..0aaa75939 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -1,12 +1,35 @@ + // -// + 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 ofCake. + * + * PHP versions 4 and 5 + * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.app.config + * @since CakePHP v 0.2.9 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ /** * In this file you set up your database connection details. diff --git a/app/config/paths.php b/app/config/paths.php index ed818e5e0..d535da693 100644 --- a/app/config/paths.php +++ b/app/config/paths.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.config + * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -67,6 +67,11 @@ define ('MODELS', APP.'models'.DS); */ define ('CONTROLLERS', APP.'controllers'.DS); +/** + * Path to the application's controllers directory. + */ +define ('COMPONENTS', CONTROLLERS.'components'.DS); + /** * Path to the application's views directory. */ @@ -80,14 +85,14 @@ define ('HELPERS', VIEWS.'helpers'.DS); /** * Path to the application's view's layouts directory. */ -define ('LAYOUTS', APP.'views'.DS.'layouts'.DS); +define ('LAYOUTS', VIEWS.'layouts'.DS); /** * Path to the application's view's elements directory. * It's supposed to hold pieces of PHP/HTML that are used on multiple pages * and are not linked to a particular layout (like polls, footers and so on). */ -define ('ELEMENTS', APP.'views'.DS.'elements'.DS); +define ('ELEMENTS', VIEWS.'elements'.DS); /** * Path to the configuration files directory. diff --git a/app/config/routes.php b/app/config/routes.php index 1d81a3743..1488af2d4 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -25,7 +25,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.config + * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -49,6 +49,6 @@ $Route->connect ('/pages/*', array('controller'=>'Pages', 'action'=>'display')); * Then we connect url '/test' to our test controller. This is helpfull in * developement. */ -$Route->connect ('/test', array('controller'=>'Tests', 'action'=>'index')); +$Route->connect ('/tests', array('controller'=>'Tests', 'action'=>'index')); ?> diff --git a/app/config/routes.php.default b/app/config/routes.php.default index d28391028..8ee4d05b8 100644 --- a/app/config/routes.php.default +++ b/app/config/routes.php.default @@ -1,12 +1,37 @@ + // -// + 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). + * + * PHP versions 4 and 5 + * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.app.config + * @since CakePHP v 0.2.9 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ /** * In this file, you set up routes to your controllers and their actions. diff --git a/app/config/tags.ini.php b/app/config/tags.ini.php index 2c926b450..d3fd8fc2b 100644 --- a/app/config/tags.ini.php +++ b/app/config/tags.ini.php @@ -23,8 +23,8 @@ ; * @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 +; * @subpackage cake.cake.app.config +; * @since CakePHP v 0.10.0.1076 ; * @version $Revision$ ; * @modifiedby $LastChangedBy$ ; * @lastmodified $Date$ diff --git a/app/controllers/components/my_acl.php b/app/controllers/components/my_acl.php index 10d9185a7..67bf2e589 100644 --- a/app/controllers/components/my_acl.php +++ b/app/controllers/components/my_acl.php @@ -1,30 +1,43 @@ + // -// + 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 ofCake. + * + * PHP versions 4 and 5 + * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.app.controllers.componenets + * @since CakePHP v 0.2.9 + * @version $Revision$ + * @modifiedby $LastChangedBy$ * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License */ -uses('acl_base'); +uses(DS.'controller'.DS.'components'.DS.'acl_base'); /** * In this file you can extend the AclBase. * - * @package cake - * @subpackage cake.app.apis + * @package cake + * @subpackage cake.cake.app.controllers.componenets */ class MyACL extends AclBase diff --git a/app/index.php b/app/index.php index 529f88720..d2f4a2293 100644 --- a/app/index.php +++ b/app/index.php @@ -19,8 +19,8 @@ * @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.10.0.1036 + * @subpackage cake.cake.app + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ diff --git a/app/webroot/css.php b/app/webroot/css.php index c10d4a79a..4d7551659 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.public + * @subpackage cake.cake.app.webroot * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/app/webroot/index.php b/app/webroot/index.php index b99d8dbc6..ce23f7dd1 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.public + * @subpackage cake.cake.app.webroot * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/app_controller.php b/cake/app_controller.php index 447248dac..196aca615 100644 --- a/cake/app_controller.php +++ b/cake/app_controller.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.app + * @subpackage cake.cake * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/app_model.php b/cake/app_model.php index 2500add26..8b134a986 100644 --- a/cake/app_model.php +++ b/cake/app_model.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.app + * @subpackage cake.cake * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/basics.php b/cake/basics.php index 368699d7e..6179e5f80 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -296,12 +296,23 @@ if (!function_exists('array_combine')) } } +/** + * Enter description here... + * + * @param unknown_type $text + * @return unknown + */ function h($text) { return htmlspecialchars($text); } +/** + * Enter description here... + * + * @return unknown + */ function a() { $args = func_get_args(); @@ -309,6 +320,11 @@ function a() } +/** + * Enter description here... + * + * @return unknown + */ function ha() { $args = func_get_args(); @@ -322,11 +338,21 @@ function ha() } +/** + * Enter description here... + * + * @param unknown_type $text + */ function e($text) { echo $text; } +/** + * Enter description here... + * + * @param unknown_type $var + */ function pr($var) { if(DEBUG > 0) @@ -337,6 +363,12 @@ function pr($var) } } +/** + * Enter description here... + * + * @param unknown_type $p + * @return unknown + */ function params($p) { @@ -358,6 +390,11 @@ function params($p) } +/** + * Enter description here... + * + * @return unknown + */ function setUri() { if (isset($_SERVER['REQUEST_URI'])) { diff --git a/cake/dispatcher.php b/cake/dispatcher.php index 79950eca0..6e6316158 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -35,7 +35,7 @@ /** * Add Description */ -uses('error_messages', 'object', 'router', '/controller/controller', '/controller/scaffold'); +uses('error_messages', 'object', 'router', DS.'controller'.DS.'controller', DS.'controller'.DS.'scaffold'); /** * Short description for class. @@ -43,7 +43,7 @@ uses('error_messages', 'object', 'router', '/controller/controller', '/controlle * Dispatches the request, creating appropriate models and controllers. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake * @since CakePHP v 0.2.9 */ class Dispatcher extends Object @@ -59,7 +59,6 @@ class Dispatcher extends Object */ function __construct() { - $this->base = $this->baseUrl(); parent::__construct(); } @@ -75,6 +74,7 @@ class Dispatcher extends Object */ function dispatch($url, $additionalParams=array()) { + $this->base = $this->baseUrl(); $params = array_merge($this->parseParams($url), $additionalParams); $missingController = false; $missingAction = false; @@ -96,7 +96,15 @@ class Dispatcher extends Object if (!loadController($ctrlName) || !class_exists($ctrlClass)) { - $missingController = true; + if(preg_match('/([\\.]+)/',$ctrlName)) + { + $this->error404(strtolower($ctrlName),'Was not found on this server'); + exit(); + } + else + { + $missingController = true; + } } } @@ -319,7 +327,7 @@ class Dispatcher extends Object */ function error ($code, $name, $message) { - $controller = new Controller ($this); + $controller =& new Controller ($this); $controller->base = $this->base; $controller->autoLayout = false; $controller->set(array('code'=>$code, 'name'=>$name, 'message'=>$message)); diff --git a/cake/libs/cache.php b/cake/libs/cache.php index 907e866d6..11f60021a 100644 --- a/cake/libs/cache.php +++ b/cake/libs/cache.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -36,7 +36,7 @@ * Enter description here... * */ -uses('model'); +uses(DS.'model'.DS.'model'); /** * Caching for Cake. @@ -44,7 +44,7 @@ uses('model'); * * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class Cache extends Model { diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php index 6e89d20d8..4772715fa 100644 --- a/cake/libs/class_registry.php +++ b/cake/libs/class_registry.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.9.2 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -39,7 +39,7 @@ * If you need a second instance of an object, give it another key. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.9.2 */ class ClassRegistry diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php new file mode 100644 index 000000000..9a79494a9 --- /dev/null +++ b/cake/libs/controller/component.php @@ -0,0 +1,134 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.controller + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +/** + * Enter description here... + */ +uses('object'); + +/** + * + * + * @package cake + * @subpackage cake.cake.libs.controller + * @since CakePHP v TBD + */ +class Component extends Object +{ + +/** + * Enter description here... + * + * @var unknown_type + */ + var $components = array(); + +/** + * Enter description here... + * + * @var unknown_type + */ + var $controller = null; + +/** + * Constructor + * + * @return Component + */ + function Component(&$controller) + { + $this->controller =& $controller; + $loaded = array(); + return $this->_loadComponents($loaded,$this->controller->components); + } + +/** + * Enter description here... + * + * @param unknown_type $loaded + * @param unknown_type $components + * @return unknown + */ + function &_loadComponents(&$loaded, $components) + { + foreach ($components as $component) + { + if(in_array($component, array_keys($loaded)) !== true) + { + $componentFn = COMPONENTS.Inflector::underscore($component).'.php'; + if(file_exists(COMPONENTS.Inflector::underscore($component).'.php')) + { + $componentFn = COMPONENTS.Inflector::underscore($component).'.php'; + } + else if(file_exists(LIBS.'controller'.DS.'components'.DS.Inflector::underscore($component).'.php')) + { + $componentFn = LIBS.'controller'.DS.'components'.DS.Inflector::underscore($component).'.php'; + } + + $componentCn = ucfirst($component).'Component'; + + if (is_file($componentFn)) + { + require_once $componentFn; + + if(class_exists($componentCn)===true) + { + $this->controller->{$component} =& new $componentCn; + $loaded[$component] =& $this->controller->{$component}; + if (isset($this->controller->{$component}->components) && is_array($this->controller->{$component}->components)) + { + $loaded =& $this->_loadComponents($loaded, $this->controller->{$component}->components); + } + } + else + { + $error =& new AppController(); + $error->autoLayout = true; + $error->base = $this->controller->base; + call_user_func_array(array(&$error, 'missingComponentClass'), $component); + exit(); + } + } + else + { + $error =& new AppController(); + $error->autoLayout = true; + $error->base = $this->controller->base; + call_user_func_array(array(&$error, 'missingComponentFile'), Inflector::underscore($component)); + exit(); + } + } + } + return $loaded; + } +} + +?> \ No newline at end of file diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index d860a2d34..4d47ce519 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -23,8 +23,8 @@ * @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 + * @subpackage cake.cake.libs.controller.components + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -37,11 +37,11 @@ * 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 + * @subpackage cake.cake.libs.controller.components + * @since CakePHP v 0.10.0.1076 * */ -class Acl +class AclComponent { /** @@ -51,8 +51,7 @@ class Acl */ function getACL() { - require_once(CONFIGS.'core.php'); - require_once(APP.'apis'.DS.ACL_FILENAME); + require_once(COMPONENTS.ACL_FILENAME); $myacl = ACL_CLASSNAME; return new $myacl; diff --git a/cake/libs/controller/components/acl_base.php b/cake/libs/controller/components/acl_base.php index ed87b7f65..2b164d7dc 100644 --- a/cake/libs/controller/components/acl_base.php +++ b/cake/libs/controller/components/acl_base.php @@ -21,8 +21,8 @@ * @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 + * @subpackage cake.cake.libs.controller.components + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -34,11 +34,11 @@ uses('error_messages'); /** * Access Control List abstract class. Not to be instantiated. - * Subclasses of this class are used by AclHelper to perform ACL checks in Cake. + * Subclasses of this class are used by AclComponent to perform ACL checks in Cake. * * @package cake - * @subpackage libs - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.controller.components + * @since CakePHP v 0.10.0.1076 * */ class AclBase diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index e12e717e2..f4ec230e8 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -21,7 +21,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.controller * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -32,7 +32,7 @@ /** * Include files */ -uses('/model/model', 'inflector', 'folder', '/view/view', '/view/helper'); +uses(DS.'controller'.DS.'component',DS.'model'.DS.'model', 'inflector', 'folder', DS.'view'.DS.'view'); /** * Controller @@ -43,7 +43,7 @@ uses('/model/model', 'inflector', 'folder', '/view/view', '/view/helper'); * and creates the model object if proper class exists. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.controller * @since CakePHP v 0.2.9 * */ @@ -175,6 +175,13 @@ class Controller extends Object * @access public */ var $beforeFilter = null; + + /** + * Enter description here... + * + * @var unknown_type + */ + var $components = array(); /** * Constructor. @@ -211,6 +218,11 @@ class Controller extends Object */ function constructClasses(){ + if (!empty($this->components)) + { + $component =& new Component($this); + } + if (!empty($this->beforeFilter)) { if(is_array($this->beforeFilter)) diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php index 021040e9b..ec56c79f9 100644 --- a/cake/libs/controller/pages_controller.php +++ b/cake/libs/controller/pages_controller.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.app.controllers + * @subpackage cake.cake.libs.controller * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -43,7 +43,7 @@ * will inherit them. * * @package cake - * @subpackage cake.app.controllers + * @subpackage cake.cake.libs.controller */ class PagesController extends AppController{ diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index 22bb480a7..b6ceac473 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -23,8 +23,8 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs - * @since Cake v 1.0.0.172 + * @subpackage cake.cake.libs.controller + * @since Cake v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -34,7 +34,7 @@ /** * Enter description here... */ -uses('/model/model', 'inflector', 'object'); +uses(DS.'model'.DS.'model', 'inflector', 'object'); /** * Scaffolding is a set of automatic views, forms and controllers for starting web development work faster. @@ -45,8 +45,8 @@ uses('/model/model', 'inflector', 'object'); * scaffolded actions with custom-made ones. * * @package cake - * @subpackage cake.libs - * @since Cake v 1.0.0.172 + * @subpackage cake.cake.libs.controller + * @since Cake v 0.10.0.1076 */ class Scaffold extends Object { diff --git a/cake/libs/controller/templates/scaffolds/edit.thtml b/cake/libs/controller/templates/scaffolds/edit.thtml index 15b7ca607..40c188744 100644 --- a/cake/libs/controller/templates/scaffolds/edit.thtml +++ b/cake/libs/controller/templates/scaffolds/edit.thtml @@ -1,3 +1,34 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.controller.templates.scaffolds + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> formTag('/'.Inflector::underscore($this->name).'/update'); diff --git a/cake/libs/controller/templates/scaffolds/list.thtml b/cake/libs/controller/templates/scaffolds/list.thtml index 3cda7cdcd..e541a22f1 100644 --- a/cake/libs/controller/templates/scaffolds/list.thtml +++ b/cake/libs/controller/templates/scaffolds/list.thtml @@ -1,3 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.controller.templates.scaffolds + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> + name); //$table = Inflector::underscore(get_class($this->models[strtolower(Inflector::singularize(Inflector::underscore($this->name)))])); diff --git a/cake/libs/controller/templates/scaffolds/new.thtml b/cake/libs/controller/templates/scaffolds/new.thtml index a17eeb62d..9ee17e6c3 100644 --- a/cake/libs/controller/templates/scaffolds/new.thtml +++ b/cake/libs/controller/templates/scaffolds/new.thtml @@ -1,3 +1,34 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.controller.templates.scaffolds + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> formTag('/'.Inflector::underscore($this->name).'/create'); diff --git a/cake/libs/controller/templates/scaffolds/scaffold.thtml b/cake/libs/controller/templates/scaffolds/scaffold.thtml index 9814bf8ef..45b3689bf 100644 --- a/cake/libs/controller/templates/scaffolds/scaffold.thtml +++ b/cake/libs/controller/templates/scaffolds/scaffold.thtml @@ -1,3 +1,34 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.controller.templates.scaffolds + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> diff --git a/cake/libs/controller/templates/scaffolds/show.thtml b/cake/libs/controller/templates/scaffolds/show.thtml index 4fa457177..01be3711e 100644 --- a/cake/libs/controller/templates/scaffolds/show.thtml +++ b/cake/libs/controller/templates/scaffolds/show.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.controller.templates.scaffolds + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> + + name); $modelKey = Inflector::underscore($modelName); diff --git a/cake/libs/error_messages.php b/cake/libs/error_messages.php index d42aed2b2..da18b6af4 100644 --- a/cake/libs/error_messages.php +++ b/cake/libs/error_messages.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/libs/file.php b/cake/libs/file.php index 95f6e89fa..1225d736e 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -22,7 +22,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -41,7 +41,7 @@ uses('object'); * * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class File extends Object diff --git a/cake/libs/flay.php b/cake/libs/flay.php index 10ca50b86..64117a77c 100644 --- a/cake/libs/flay.php +++ b/cake/libs/flay.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses('object'); * Text-to-html parser, similar to Textile or RedCloth, only with a little different syntax. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ diff --git a/cake/libs/folder.php b/cake/libs/folder.php index 25459ee94..e9f71b9e6 100644 --- a/cake/libs/folder.php +++ b/cake/libs/folder.php @@ -22,7 +22,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses('object'); * Long description for class * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class Folder extends Object { @@ -67,7 +67,7 @@ class Folder extends Object { * @param string $path * @param bollean $path */ - function Folder ($path=false , $create = false) + function Folder ($path = false , $create = false, $mode = false) { if (empty($path)) { @@ -76,7 +76,7 @@ class Folder extends Object { if ( !file_exists( $path ) && $create==true ) { - $this->mkdirr($path); + $this->mkdirr($path, $mode); } $this->cd($path); } @@ -362,10 +362,11 @@ class Folder extends Object { // Crawl up the directory tree $next_pathname = substr($pathname, 0, strrpos($pathname, DIRECTORY_SEPARATOR)); - if (mkdirr($next_pathname, $mode)) + if ($this->mkdirr($next_pathname, $mode)) { if (!file_exists($pathname)) { + umask(0); return mkdir($pathname, $mode); } } diff --git a/cake/libs/generator/bake.php b/cake/libs/generator/bake.php index a851f6d37..edccf3d3a 100644 --- a/cake/libs/generator/bake.php +++ b/cake/libs/generator/bake.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.generator * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -44,9 +44,9 @@ uses('object', 'inflector'); * base class for /scripts/add.php. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.generator * @since CakePHP v 0.2.9 - */ + */ class Bake extends Object { /** diff --git a/cake/libs/generator/base.php b/cake/libs/generator/base.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/base.php +++ b/cake/libs/generator/base.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/commands.php b/cake/libs/generator/commands.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/commands.php +++ b/cake/libs/generator/commands.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/applications/app/app_generator.php b/cake/libs/generator/generators/applications/app/app_generator.php index 3b161c617..2475c63d3 100644 --- a/cake/libs/generator/generators/applications/app/app_generator.php +++ b/cake/libs/generator/generators/applications/app/app_generator.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.applications.app - * @since Cake 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.cake.libs.generator.generators.applications.app + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/controller/controller_generator.php b/cake/libs/generator/generators/class_templates/controller/controller_generator.php index 36383532b..11439ad4c 100644 --- a/cake/libs/generator/generators/class_templates/controller/controller_generator.php +++ b/cake/libs/generator/generators/class_templates/controller/controller_generator.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.controller - * @since Cake 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.cake.libs.generator.generators.class_templates.controller + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/controller/templates/component.php b/cake/libs/generator/generators/class_templates/controller/templates/component.php new file mode 100644 index 000000000..2c66bce20 --- /dev/null +++ b/cake/libs/generator/generators/class_templates/controller/templates/component.php @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.controller.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/controller/templates/controller.php b/cake/libs/generator/generators/class_templates/controller/templates/controller.php index 718906fd1..2c66bce20 100644 --- a/cake/libs/generator/generators/class_templates/controller/templates/controller.php +++ b/cake/libs/generator/generators/class_templates/controller/templates/controller.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.controller.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.controller.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/controller/templates/functional_test.php b/cake/libs/generator/generators/class_templates/controller/templates/functional_test.php index 718906fd1..2c66bce20 100644 --- a/cake/libs/generator/generators/class_templates/controller/templates/functional_test.php +++ b/cake/libs/generator/generators/class_templates/controller/templates/functional_test.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.controller.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.controller.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/controller/templates/helper.php b/cake/libs/generator/generators/class_templates/controller/templates/helper.php deleted file mode 100644 index 718906fd1..000000000 --- a/cake/libs/generator/generators/class_templates/controller/templates/helper.php +++ /dev/null @@ -1,33 +0,0 @@ - + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + Licensed under The MIT License + // -// + Redistributions of files must retain the above copyright notice. + // -// + See: http://www.opensource.org/licenses/mit-license.php + // -////////////////////////////////////////////////////////////////////////// - -/** - * - * - * - * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.controller.templates - * @since Cake v 0.2.9 - * @version $Revision$ - * @modifiedby $LastChangedBy$ - * @lastmodified $Date$ - * @license http://www.opensource.org/licenses/mit-license.php The MIT License - */ - -?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/controller/templates/view.thtml b/cake/libs/generator/generators/class_templates/controller/templates/view.thtml deleted file mode 100644 index e69de29bb..000000000 diff --git a/cake/libs/generator/generators/class_templates/model/model_generator.php b/cake/libs/generator/generators/class_templates/model/model_generator.php index 8e92a416a..09b7680da 100644 --- a/cake/libs/generator/generators/class_templates/model/model_generator.php +++ b/cake/libs/generator/generators/class_templates/model/model_generator.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.model - * @since Cake 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.cake.libs.generator.generators.class_templates.model + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/model/templates/fixtures.php b/cake/libs/generator/generators/class_templates/model/templates/fixtures.php index a49b14e60..725853406 100644 --- a/cake/libs/generator/generators/class_templates/model/templates/fixtures.php +++ b/cake/libs/generator/generators/class_templates/model/templates/fixtures.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.model.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.model.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/model/templates/model.php b/cake/libs/generator/generators/class_templates/model/templates/model.php index a49b14e60..725853406 100644 --- a/cake/libs/generator/generators/class_templates/model/templates/model.php +++ b/cake/libs/generator/generators/class_templates/model/templates/model.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.model.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.model.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/model/templates/unit_test.php b/cake/libs/generator/generators/class_templates/model/templates/unit_test.php index a49b14e60..725853406 100644 --- a/cake/libs/generator/generators/class_templates/model/templates/unit_test.php +++ b/cake/libs/generator/generators/class_templates/model/templates/unit_test.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.model.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.model.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php b/cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php index d186dbaea..bf7bc93e5 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php +++ b/cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.scaffold - * @since Cake 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.cake.libs.generator.generators.class_templates.scaffold + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/controller.php b/cake/libs/generator/generators/class_templates/scaffold/templates/controller.php index 6aa1cdcb7..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/controller.php +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/controller.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.scaffold.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/form_scaffolding.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/form_scaffolding.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/form_scaffolding.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/form_scaffolding.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/functional_test.php b/cake/libs/generator/generators/class_templates/scaffold/templates/functional_test.php index 6aa1cdcb7..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/functional_test.php +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/functional_test.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.scaffold.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/helper.php b/cake/libs/generator/generators/class_templates/scaffold/templates/helper.php index 6aa1cdcb7..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/helper.php +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/helper.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.scaffold.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/view_edit.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/view_edit.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/view_edit.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/view_edit.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/view_list.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/view_list.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/view_list.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/view_list.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/view_new.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/view_new.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/view_new.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/view_new.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/scaffold/templates/view_show.thtml b/cake/libs/generator/generators/class_templates/scaffold/templates/view_show.thtml index e69de29bb..8524c2bfc 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/view_show.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/view_show.thtml @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.scaffold.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/view/templates/helper.php b/cake/libs/generator/generators/class_templates/view/templates/helper.php new file mode 100644 index 000000000..b9eb56cc6 --- /dev/null +++ b/cake/libs/generator/generators/class_templates/view/templates/helper.php @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.view.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/view/templates/view.thtml b/cake/libs/generator/generators/class_templates/view/templates/view.thtml new file mode 100644 index 000000000..193260c0b --- /dev/null +++ b/cake/libs/generator/generators/class_templates/view/templates/view.thtml @@ -0,0 +1,31 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.view.templates + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/view/view_generator.php b/cake/libs/generator/generators/class_templates/view/view_generator.php new file mode 100644 index 000000000..b9eb56cc6 --- /dev/null +++ b/cake/libs/generator/generators/class_templates/view/view_generator.php @@ -0,0 +1,35 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.generator.generators.class_templates.view.templates + * @since CakePHP v TBD + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ + +?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/web/templates/api_definition.php b/cake/libs/generator/generators/class_templates/web/templates/api_definition.php index 117751044..34f623d07 100644 --- a/cake/libs/generator/generators/class_templates/web/templates/api_definition.php +++ b/cake/libs/generator/generators/class_templates/web/templates/api_definition.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.web.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.web.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/web/templates/controller.php b/cake/libs/generator/generators/class_templates/web/templates/controller.php index 117751044..34f623d07 100644 --- a/cake/libs/generator/generators/class_templates/web/templates/controller.php +++ b/cake/libs/generator/generators/class_templates/web/templates/controller.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.web.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.web.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/web/templates/functional_test.php b/cake/libs/generator/generators/class_templates/web/templates/functional_test.php index 117751044..34f623d07 100644 --- a/cake/libs/generator/generators/class_templates/web/templates/functional_test.php +++ b/cake/libs/generator/generators/class_templates/web/templates/functional_test.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.web.templates - * @since Cake 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.cake.libs.generator.generators.class_templates.web.templates + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/generators/class_templates/web/web_generator.php b/cake/libs/generator/generators/class_templates/web/web_generator.php index 90c7abaec..eefe3aea8 100644 --- a/cake/libs/generator/generators/class_templates/web/web_generator.php +++ b/cake/libs/generator/generators/class_templates/web/web_generator.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.generators.components.web - * @since Cake 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.cake.libs.generator.generators.class_templates.web + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/lookup.php b/cake/libs/generator/lookup.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/lookup.php +++ b/cake/libs/generator/lookup.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/manifest.php b/cake/libs/generator/manifest.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/manifest.php +++ b/cake/libs/generator/manifest.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/options.php b/cake/libs/generator/options.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/options.php +++ b/cake/libs/generator/options.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/scripts.php b/cake/libs/generator/scripts.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/scripts.php +++ b/cake/libs/generator/scripts.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/scripts/destroy.php b/cake/libs/generator/scripts/destroy.php index 443823138..25f447c69 100644 --- a/cake/libs/generator/scripts/destroy.php +++ b/cake/libs/generator/scripts/destroy.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.scripts - * @since Cake 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.cake.libs.generator.scripts + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/scripts/generate.php b/cake/libs/generator/scripts/generate.php index 443823138..25f447c69 100644 --- a/cake/libs/generator/scripts/generate.php +++ b/cake/libs/generator/scripts/generate.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.scripts - * @since Cake 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.cake.libs.generator.scripts + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/scripts/update.php b/cake/libs/generator/scripts/update.php index 443823138..25f447c69 100644 --- a/cake/libs/generator/scripts/update.php +++ b/cake/libs/generator/scripts/update.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator.scripts - * @since Cake 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.cake.libs.generator.scripts + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/simple_logger.php b/cake/libs/generator/simple_logger.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/simple_logger.php +++ b/cake/libs/generator/simple_logger.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/generator/spec.php b/cake/libs/generator/spec.php index e82d3f8b8..f225d371d 100644 --- a/cake/libs/generator/spec.php +++ b/cake/libs/generator/spec.php @@ -1,33 +1,35 @@ + // -// + Copyright: (c) 2005, Cake Authors/Developers + // -// + Author(s): Michal Tatarynowicz aka Pies + // -// + Larry E. Masters aka PhpNut + // -// + Kamil Dzielinski aka Brego + // -// +------------------------------------------------------------------+ // -// + 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$ */ /** + * Creates ready-to-use file skeletons for applications. + * + * + * Used by /scripts/bake.php. * + * PHP versions 4 and 5 * + * CakePHP : Rapid Development Framework + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The MIT License + * Redistributions of files must retain the above copyright notice. * * @filesource - * @author Cake Authors/Developers - * @copyright Copyright (c) 2005, Cake Authors/Developers - * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers - * @package cake - * @subpackage cake.libs.generator - * @since Cake 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.cake.libs.generator + * @since CakePHP v TBD + * @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 */ ?> \ No newline at end of file diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index 92617c55f..1447ddd0b 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -38,10 +38,10 @@ * Test with $i = new Inflector(); $i->test(); * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ -class Inflector extends Object +class Inflector// extends Object { /** @@ -127,7 +127,7 @@ class Inflector extends Object '/([ti])a$/' => '\1um', '/(p)eople$/' => '\1\2erson', '/(m)en$/' => '\1an', - '/(s)tatus$/' => '\1\2tatus', + '/(s)tatuses$/' => '\1\2tatus', '/(c)hildren$/' => '\1\2hild', '/(n)ews$/' => '\1\2ews', '/s$/' => '' diff --git a/cake/libs/legacy.php b/cake/libs/legacy.php index 130a1cdaa..eee623cf6 100644 --- a/cake/libs/legacy.php +++ b/cake/libs/legacy.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/libs/log.php b/cake/libs/log.php index 863f58d14..7cbdeb407 100644 --- a/cake/libs/log.php +++ b/cake/libs/log.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses('file'); * Long description for class * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class Log diff --git a/cake/libs/model/dbo/dbo.php b/cake/libs/model/dbo/dbo.php index 3d35be164..7d89f22ae 100644 --- a/cake/libs/model/dbo/dbo.php +++ b/cake/libs/model/dbo/dbo.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -76,7 +76,7 @@ uses('object'); * * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 */ class DBO extends Object diff --git a/cake/libs/model/dbo/dbo_adodb.php b/cake/libs/model/dbo/dbo_adodb.php index a9f6207cc..0f7a9b285 100644 --- a/cake/libs/model/dbo/dbo_adodb.php +++ b/cake/libs/model/dbo/dbo_adodb.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ require_once(VENDORS.'adodb/adodb.inc.php'); * Database abstraction implementation for the AdoDB library. * * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 */ class DBO_AdoDB extends DBO diff --git a/cake/libs/model/dbo/dbo_factory.php b/cake/libs/model/dbo/dbo_factory.php index 761835a5d..e6c213bdc 100644 --- a/cake/libs/model/dbo/dbo_factory.php +++ b/cake/libs/model/dbo/dbo_factory.php @@ -23,8 +23,8 @@ * @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 + * @subpackage cake.cake.libs.model.dbo + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -48,8 +48,8 @@ config('database'); * Creates DBO-descendant objects from a given db connection configuration * * @package cake - * @subpackage cake.libs.dbo - * @since CakePHP v 1.0.0.0 + * @subpackage cake.cake.libs.model.dbo + * @since CakePHP v 0.10.0.1076 * */ class DboFactory extends Object diff --git a/cake/libs/model/dbo/dbo_generic.php b/cake/libs/model/dbo/dbo_generic.php index 952898b2b..0bb229bd7 100644 --- a/cake/libs/model/dbo/dbo_generic.php +++ b/cake/libs/model/dbo/dbo_generic.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -37,7 +37,7 @@ * All implementations override this class. * * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 */ class DBO_generic extends DBO diff --git a/cake/libs/model/dbo/dbo_mysql.php b/cake/libs/model/dbo/dbo_mysql.php index 075448dc9..ed10bbe91 100644 --- a/cake/libs/model/dbo/dbo_mysql.php +++ b/cake/libs/model/dbo/dbo_mysql.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -43,7 +43,7 @@ uses('model'.DS.'dbo'.DS.'dbo'); * Long description for class * * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 */ class DBO_MySQL extends DBO diff --git a/cake/libs/model/dbo/dbo_pear.php b/cake/libs/model/dbo/dbo_pear.php index 64bce128b..f81b04fed 100644 --- a/cake/libs/model/dbo/dbo_pear.php +++ b/cake/libs/model/dbo/dbo_pear.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -44,7 +44,7 @@ vendor('Pear/DB'); * Long description for class * * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 */ class DBO_Pear extends DBO diff --git a/cake/libs/model/dbo/dbo_postgres.php b/cake/libs/model/dbo/dbo_postgres.php index d69e7fa48..6ce38ef9f 100644 --- a/cake/libs/model/dbo/dbo_postgres.php +++ b/cake/libs/model/dbo/dbo_postgres.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.9.1.114 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses('model'.DS.'dbo'.DS.'dbo'); * Long description for class * * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.9.1.114 */ class DBO_Postgres extends DBO diff --git a/cake/libs/model/dbo/dbo_sqlite.php b/cake/libs/model/dbo/dbo_sqlite.php index f6f8efb7b..75fed5882 100644 --- a/cake/libs/model/dbo/dbo_sqlite.php +++ b/cake/libs/model/dbo/dbo_sqlite.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.9.0 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses('model'.DS.'dbo'.DS.'dbo'); * Long description for class * * @package cake - * @subpackage cake.libs.dbo + * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.9.0 */ class DBO_SQLite extends DBO diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 298d64159..cf483a6ea 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.model * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -40,14 +40,14 @@ uses('object', 'class_registry', 'validators', 'inflector'); /** * Short description for class * - * DBO-backed object data model, loosely based on RoR concepts (www.rubyonrails.com). + * DBO-backed object data model. * Automatically selects a database table name based on a pluralized lowercase object class name * (i.e. class 'User' => table 'users'; class 'Man' => table 'men') * The table is required to have at least 'id auto_increment', 'created datetime', * and 'modified datetime' fields. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.model * @since CakePHP v 0.2.9 * */ @@ -325,8 +325,8 @@ class Model extends Object break; } } - //$this->_belongsTo = array($className,$association); - $this->linkAssociation('Belongs', $className, $this->id); + $className = Inflector::singularize($className); + $this->linkAssociation('Belongs', $this->$className->table, $this->id); $this->relink('Belongs'); unset($className); } @@ -336,9 +336,9 @@ class Model extends Object $association = explode(',', $this->belongsTo); foreach ($association as $modelName) { - // $this->_belongsTo = array($modelName,$modelName); $this->_constructAssociatedModels($modelName , 'Belongs'); - $this->linkAssociation('Belongs', $modelName, $this->id); + $modelName = Inflector::singularize($modelName); + $this->linkAssociation('Belongs', $this->$modelName->table, $this->id); $this->relink('Belongs'); } } @@ -368,6 +368,7 @@ class Model extends Object if ($classCreated === false) { $this->_constructAssociatedModels($className , 'One'); + $className = $this->$className->table; $classCreated = true; } @@ -402,8 +403,8 @@ class Model extends Object break; } } - // $this->_hasOne = array($className,$association); - $this->linkAssociation('One', $className, $this->id); + $className = Inflector::singularize($className); + $this->linkAssociation('One', $this->$className->table, $this->id); $this->relink('One'); unset($className); } @@ -413,9 +414,9 @@ class Model extends Object $association = explode(',', $this->hasOne); foreach ($association as $modelName) { - // $this->_hasOne = array($modelName,$modelName); $this->_constructAssociatedModels($modelName , 'One'); - $this->linkAssociation('One', $modelName, $this->id); + $modelName = Inflector::singularize($modelName); + $this->linkAssociation('One', $this->$modelName->table, $this->id); $this->relink('One'); } } @@ -444,7 +445,7 @@ class Model extends Object if ($classCreated === false) { - $this->_constructAssociatedModels($className , 'Many'); + $this->_constructAssociatedModels($className , 'Many'); $classCreated = true; } switch ($option) @@ -481,8 +482,8 @@ class Model extends Object break; } } - // $this->_hasMany = array($className,$association); - $this->linkAssociation('Many', $className, $this->id); + $className = Inflector::singularize($className); + $this->linkAssociation('Many', $this->$className->table, $this->id); $this->relink('Many'); unset($className); } @@ -492,9 +493,9 @@ class Model extends Object $association = explode(',', $this->hasMany); foreach ($association as $modelName) { - // $this->_hasMany = array($modelName,$modelName); $this->_constructAssociatedModels($modelName , 'Many'); - $this->linkAssociation('Many', $modelName, $this->id); + $modelName = Inflector::singularize($modelName); + $this->linkAssociation('Many', $this->$modelName->table, $this->id); $this->relink('Many'); } } @@ -516,9 +517,9 @@ class Model extends Object $association = explode(',', $this->hasAndBelongsToMany); foreach ($association as $modelName) { - // $this->_hasAndBelongsToMany = array($modelName,$modelName); $this->_constructAssociatedModels($modelName , 'ManyTo'); - $this->linkAssociation('ManyTo', $modelName, $this->id); + $modelName = Inflector::singularize($modelName); + $this->linkAssociation('ManyTo', $this->$modelName->table, $this->id); $this->relink('ManyTo'); } } diff --git a/cake/libs/neat_array.php b/cake/libs/neat_array.php index 4253e0915..69b3e69b4 100644 --- a/cake/libs/neat_array.php +++ b/cake/libs/neat_array.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -37,7 +37,7 @@ * Long description for class * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class NeatArray diff --git a/cake/libs/neat_string.php b/cake/libs/neat_string.php index c0f94e1dc..b768dfe7d 100644 --- a/cake/libs/neat_string.php +++ b/cake/libs/neat_string.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -37,7 +37,7 @@ * Long description for class * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @static */ diff --git a/cake/libs/new_inflector.php b/cake/libs/new_inflector.php index 98fe2d1c4..83680338d 100644 --- a/cake/libs/new_inflector.php +++ b/cake/libs/new_inflector.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v .0.10.x.x * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -37,7 +37,7 @@ * Inflector pluralizes and singularizes English words. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v .0.10.x.x */ class Inflector diff --git a/cake/libs/object.php b/cake/libs/object.php index 796fae68e..cd6ee3970 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses('log'); * Long description for class * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class Object diff --git a/cake/libs/router.php b/cake/libs/router.php index a87897388..f868701c8 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -40,7 +40,7 @@ uses('object', 'neat_array'); * Parses the request URL into controller, action, and parameters. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * */ @@ -127,7 +127,7 @@ class Router extends Object { $default_route = array ( '/:controller/:action/* (default)', - "#^(?:\/(?:([a-zA-Z0-9_\-]+)(?:\/([a-zA-Z0-9_\-]+)(?:\/(.*))?)?))[\/]*$#", + '/^(?:\/(?:([a-zA-Z0-9_\\-\\.]+)(?:\\/([a-zA-Z0-9_\\-\\.]+)(?:\\/(.*))?)?))[\\/]*$/', array('controller', 'action'), array() ); @@ -135,7 +135,7 @@ class Router extends Object { $admin_route = array ( '/:controller/:admin/:action/* (default)', - "#^(?:\/(?:([a-zA-Z0-9_\-]+)(?:\/(admin)(?:\/([a-zA-Z0-9_\-]+)(?:\/(.*))?)?)?))[\/]*$#", + '/^(?:\/(?:([a-zA-Z0-9_\\-\\.]+)(?:\\/(admin)(?:\\/([a-zA-Z0-9_\\-\\.]+)(?:\/(.*))?)?)?))[\/]*$/', array('controller', 'admin', 'action'), array() ); diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php index 6935d8a8e..515433dd1 100644 --- a/cake/libs/sanitize.php +++ b/cake/libs/sanitize.php @@ -23,8 +23,8 @@ * @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 + * @subpackage cake.cake.libs + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -37,8 +37,8 @@ * Long description for class * * @package cake - * @subpackage cake.libs - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs + * @since CakePHP v 0.10.0.1076 * */ class Sanitize diff --git a/cake/libs/time.php b/cake/libs/time.php index 17dbb6bc4..d596c4675 100644 --- a/cake/libs/time.php +++ b/cake/libs/time.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -42,7 +42,7 @@ uses ('object'); * The Time class handles and formats date and time information. * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 */ class Time extends Object diff --git a/cake/libs/validators.php b/cake/libs/validators.php index 2e69672a8..07edba370 100644 --- a/cake/libs/validators.php +++ b/cake/libs/validators.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index be07bd99e..46865e421 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.view * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -37,7 +37,7 @@ * Long description for class * * @package cake - * @subpackage cake.libs + * @subpackage cake.cake.libs.view * @since CakePHP v 0.9.2 * */ diff --git a/cake/libs/view/helpers/acl.php b/cake/libs/view/helpers/acl.php index df28aae69..0ef81421a 100644 --- a/cake/libs/view/helpers/acl.php +++ b/cake/libs/view/helpers/acl.php @@ -23,8 +23,8 @@ * @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 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -38,8 +38,8 @@ * To-be-implemented. * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * */ class AclHelper diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php index 1ec3eadc7..46c48a50d 100644 --- a/cake/libs/view/helpers/ajax.php +++ b/cake/libs/view/helpers/ajax.php @@ -23,8 +23,8 @@ * @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 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -38,8 +38,8 @@ * Helps doing AJAX using the Prototype library. * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * */ diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index 230bc7c8f..7e72dc7e3 100644 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -23,8 +23,8 @@ * @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 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -58,8 +58,8 @@ define('TAG_FIELDSET', '
%s%s'); * Automatic generation of HTML FORMs from given data. * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * */ class FormHelper extends Helper diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index 48de056ff..ac2ddcac0 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -21,7 +21,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.libs.helpers + * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.9.1 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -35,7 +35,7 @@ * HtmlHelper encloses all methods needed while working with HTML pages. * * @package cake - * @subpackage cake.libs.helpers + * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.9.1 */ class HtmlHelper extends Helper diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php index aae18fd88..435519239 100644 --- a/cake/libs/view/helpers/javascript.php +++ b/cake/libs/view/helpers/javascript.php @@ -21,8 +21,8 @@ * @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 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -36,8 +36,8 @@ * JavascriptHelper encloses all methods needed while working with JavaScript. * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 */ class JavascriptHelper extends Helper @@ -66,7 +66,7 @@ class JavascriptHelper extends Helper function link($url) { if(strpos($url, ".") === false) $url .= ".js"; - return sprintf($this->tags['javascriptlink'], $this->base . JS_URL . $url); + return sprintf($this->tags['javascriptlink'], $this->webroot . JS_URL . $url); } /** @@ -160,7 +160,7 @@ class JavascriptHelper extends Helper */ function includeScript ($script = "") { - $dir = substr(JS, 0, strlen(JS) - 1); + $dir = $this->webroot . JS_URL; if($script == "") { $files = scandir($dir); $javascript = ''; @@ -168,13 +168,13 @@ class JavascriptHelper extends Helper { if (substr($file, -3) == '.js') { - $javascript .= file_get_contents("$dir/$file") . "\n\n"; + $javascript .= file_get_contents("{$dir}{$file}") . "\n\n"; } } } else { - $javascript = file_get_contents("$dir/$script.js") . "\n\n"; + $javascript = file_get_contents("{$dir}$script.js") . "\n\n"; } return $this->codeBlock("\n\n" . $javascript); } diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php index 230608198..8ab2ca389 100644 --- a/cake/libs/view/helpers/number.php +++ b/cake/libs/view/helpers/number.php @@ -24,8 +24,8 @@ * @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 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -39,8 +39,8 @@ * Methods to make numbers more readable. * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * */ class NumberHelper extends Helper diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php index 408d06853..ea3167d3a 100644 --- a/cake/libs/view/helpers/text.php +++ b/cake/libs/view/helpers/text.php @@ -24,8 +24,8 @@ * @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 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -35,7 +35,7 @@ /** * Enter description here... */ -uses('flay', 'helpers/html'); +uses('flay', DS.'view'.DS.'helpers'.DS.'html'); /** * Text helper library. @@ -43,8 +43,8 @@ uses('flay', 'helpers/html'); * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links... * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * */ class TextHelper extends Helper diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php index b3c317288..8e583a658 100644 --- a/cake/libs/view/helpers/time.php +++ b/cake/libs/view/helpers/time.php @@ -21,8 +21,8 @@ * @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.1 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 * @version $Revision: 578 $ * @modifiedby $LastChangedBy: phpnut $ * @lastmodified $Date: 2005-08-11 22:09:07 -0600 (Thu, 11 Aug 2005) $ @@ -35,8 +35,8 @@ * Manipulation of time data. * * @package cake - * @subpackage cake.libs.helpers - * @since CakePHP v 0.9.2 + * @subpackage cake.cake.libs.view.helpers + * @since CakePHP v 0.10.0.1076 */ class TimeHelper extends Helper { @@ -213,6 +213,22 @@ class TimeHelper extends Helper } + /** + * Returns true if given datetime string is tomorrow. + * + * @param string $date_string Datetime string or Unix timestamp + * @param boolean $return Whether this method should return a value + * or output it. This overrides AUTO_OUTPUT. + * @return boolean True if datetime string was yesterday + */ + function isTomorrow ($date_string, $return = false) { + $date = $this->fromString($date_string); + $ret = date('Y-m-d', $date) == date('Y-m-d', strtotime('tomorrow')); + + return $this->output($ret, $return); + } + + /** * Returns a UNIX timestamp from a textual datetime description. Wrapper for PHP function strtotime(). * diff --git a/cake/libs/view/templates/errors/missing_action.thtml b/cake/libs/view/templates/errors/missing_action.thtml index 05b0d74de..a9fba59ad 100644 --- a/cake/libs/view/templates/errors/missing_action.thtml +++ b/cake/libs/view/templates/errors/missing_action.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> name)."Controller"; ?>

Missing Method in

diff --git a/cake/libs/view/templates/errors/missing_controller.thtml b/cake/libs/view/templates/errors/missing_controller.thtml index ed215c1a2..f81409449 100644 --- a/cake/libs/view/templates/errors/missing_controller.thtml +++ b/cake/libs/view/templates/errors/missing_controller.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?>

Missing controller

controller->missingController; ?>

You are seeing this error because controller diff --git a/cake/libs/view/templates/errors/missing_database.thtml b/cake/libs/view/templates/errors/missing_database.thtml index bbaad6e72..c493d0725 100644 --- a/cake/libs/view/templates/errors/missing_database.thtml +++ b/cake/libs/view/templates/errors/missing_database.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?>

Requires a Database Connection

Missing Database Connection: Model controller->missingConnection;?> requires a database connection diff --git a/cake/libs/view/templates/errors/missing_helper_class.thtml b/cake/libs/view/templates/errors/missing_helper_class.thtml index 501209a11..7314891c3 100644 --- a/cake/libs/view/templates/errors/missing_helper_class.thtml +++ b/cake/libs/view/templates/errors/missing_helper_class.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision:$ + * @modifiedby $LastChangedBy:$ + * @lastmodified $Date:$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> controller->missingHelperClass; @@ -6,14 +39,14 @@ ?>

Missing Helper Class

-

You are seeing this error because the helper class +

You are seeing this error because the view helper class can't be found or doesn't exist in

Notice: this error is being rendered by the app/views/errors/missing_helper_class.thtml -view file, a user-customizable error page for handling non-existent helper classes. +view file, a user-customizable error page for handling non-existent view helper classes.

diff --git a/cake/libs/view/templates/errors/missing_helper_file.thtml b/cake/libs/view/templates/errors/missing_helper_file.thtml index 5da3d76ff..044f43f3e 100644 --- a/cake/libs/view/templates/errors/missing_helper_file.thtml +++ b/cake/libs/view/templates/errors/missing_helper_file.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision:$ + * @modifiedby $LastChangedBy:$ + * @lastmodified $Date:$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> controller->missingHelperClass; @@ -6,14 +39,14 @@ ?>

Missing Helper File

-

You are seeing this error because the helper file +

You are seeing this error because the view helper file can't be found or doesn't exist

Notice: this error is being rendered by the app/views/errors/missing_helper_file.thtml -view file, a user-customizable error page for handling non-existent helper files. +view file, a user-customizable error page for handling non-existent view helper files.

diff --git a/cake/libs/view/templates/errors/missing_scaffolddb.thtml b/cake/libs/view/templates/errors/missing_scaffolddb.thtml index 5c332c9f2..c34be52f7 100644 --- a/cake/libs/view/templates/errors/missing_scaffolddb.thtml +++ b/cake/libs/view/templates/errors/missing_scaffolddb.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?>

Scaffold Requires a Database Connection

Missing Database Connection: Scaffold Does not work without a database connection diff --git a/cake/libs/view/templates/errors/missing_table.thtml b/cake/libs/view/templates/errors/missing_table.thtml index 6b1346435..358a11f68 100644 --- a/cake/libs/view/templates/errors/missing_table.thtml +++ b/cake/libs/view/templates/errors/missing_table.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> controller->missingTable;?>

Missing Database Table

No Database table for model (expected "controller->missingTableName;?>"), create it first. diff --git a/cake/libs/view/templates/errors/missing_view.thtml b/cake/libs/view/templates/errors/missing_view.thtml index bfa21c18e..4ae9f6893 100644 --- a/cake/libs/view/templates/errors/missing_view.thtml +++ b/cake/libs/view/templates/errors/missing_view.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.errors + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?>

Missing view

You are seeing this error because the view missingView;?> diff --git a/cake/libs/view/templates/layouts/ajax.thtml b/cake/libs/view/templates/layouts/ajax.thtml index 3f290130e..a51c7fce8 100644 --- a/cake/libs/view/templates/layouts/ajax.thtml +++ b/cake/libs/view/templates/layouts/ajax.thtml @@ -1 +1,34 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.layouts + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> \ No newline at end of file diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml index 4c866e139..c31911e0c 100644 --- a/cake/libs/view/templates/layouts/default.thtml +++ b/cake/libs/view/templates/layouts/default.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.layouts + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> diff --git a/cake/libs/view/templates/layouts/error.thtml b/cake/libs/view/templates/layouts/error.thtml index 0cb53875e..1a025c7fa 100644 --- a/cake/libs/view/templates/layouts/error.thtml +++ b/cake/libs/view/templates/layouts/error.thtml @@ -1,12 +1,83 @@ - + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.layouts + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> + - <?php echo $code; ?> <?php echo $name; ?> - + +charsetTag('UTF-8')?> +cssTag('cake.default')?> +

+ +

+
+
+ + + - + \ No newline at end of file diff --git a/cake/libs/view/templates/layouts/flash.thtml b/cake/libs/view/templates/layouts/flash.thtml index df81eddbb..7aed52ee2 100644 --- a/cake/libs/view/templates/layouts/flash.thtml +++ b/cake/libs/view/templates/layouts/flash.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.layouts + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?> diff --git a/cake/libs/view/templates/pages/home.thtml b/cake/libs/view/templates/pages/home.thtml index 869325af1..b55234b81 100644 --- a/cake/libs/view/templates/pages/home.thtml +++ b/cake/libs/view/templates/pages/home.thtml @@ -1,3 +1,36 @@ + + * Copyright (c) 2005, CakePHP Authors/Developers + * + * Author(s): Michal Tatarynowicz aka Pies + * Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * 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.cake.libs.view.templates.pages + * @since CakePHP v 0.10.0.1076 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ +?>

CakePHP Works!

Your database configuration file is

diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php index e0b3bc39a..14eca4509 100644 --- a/cake/libs/view/view.php +++ b/cake/libs/view/view.php @@ -22,8 +22,8 @@ * @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 + * @subpackage cake.cake.libs.view + * @since CakePHP v 0.10.0.1076 * @version $Revision$ * @modifiedby $LastChangedBy$ * @lastmodified $Date$ @@ -33,7 +33,7 @@ /** * Enter description here... */ -uses('object'); +uses('object', DS.'view'.DS.'helper'); /** * View, the V in the MVC triad. @@ -41,8 +41,8 @@ uses('object'); * Class holding methods for displaying presentation data. * * @package cake - * @subpackage cake.libs - * @since CakePHP v 0.9.1 + * @subpackage cake.cake.libs.view + * @since CakePHP v 0.10.0.1076 */ class View extends Object { @@ -505,9 +505,9 @@ class View extends Object */ function _getLayoutFileName() { - if(file_exists(VIEWS."layouts".DS."{$this->layout}.thtml")) + if(file_exists(LAYOUTS."{$this->layout}.thtml")) { - $layoutFileName = VIEWS."layouts".DS."{$this->layout}.thtml"; + $layoutFileName = LAYOUTS."{$this->layout}.thtml"; } else if(file_exists(LIBS.'view'.DS.'templates'.DS."layouts".DS."{$this->layout}.thtml")) { @@ -538,7 +538,7 @@ class View extends Object if ($this->helpers !== false) { $loadedHelpers = array(); - $loadedHelpers =& $this->_loadHelpers($loadedHelpers, $this->helpers); + $loadedHelpers = $this->_loadHelpers($loadedHelpers, $this->helpers); foreach(array_keys($loadedHelpers) as $helper) { @@ -576,16 +576,23 @@ class View extends Object return $out; } +/** + * Enter description here... + * + * @param unknown_type $loaded + * @param unknown_type $helpers + * @return unknown + */ function &_loadHelpers(&$loaded, $helpers) { foreach ($helpers as $helper) { if(in_array($helper, array_keys($loaded)) !== true) { - $helperFn = VIEWS.'helpers'.DS.Inflector::underscore($helper).'.php'; - if(file_exists(VIEWS.'helpers'.DS.Inflector::underscore($helper).'.php')) + $helperFn = HELPERS.Inflector::underscore($helper).'.php'; + if(file_exists(HELPERS.Inflector::underscore($helper).'.php')) { - $helperFn = VIEWS.'helpers'.DS.Inflector::underscore($helper).'.php'; + $helperFn = HELPERS.Inflector::underscore($helper).'.php'; } else if(file_exists(LIBS.'view'.DS.'helpers'.DS.Inflector::underscore($helper).'.php')) { @@ -599,7 +606,7 @@ class View extends Object require_once $helperFn; if(class_exists($helperCn)===true) { - ${$helper} = new $helperCn; + ${$helper} =& new $helperCn; ${$helper}->base = $this->base; ${$helper}->webroot = $this->webroot; ${$helper}->here = $this->here; @@ -621,7 +628,7 @@ class View extends Object } else { - $error = new AppController(); + $error =& new AppController(); $error->autoLayout = true; $error->base = $this->base; call_user_func_array(array(&$error, 'missingHelperClass'), $helper); @@ -630,7 +637,7 @@ class View extends Object } else { - $error = new AppController(); + $error =& new AppController(); $error->autoLayout = true; $error->base = $this->base; call_user_func_array(array(&$error, 'missingHelperFile'), Inflector::underscore($helper)); diff --git a/cake/scripts/bake.php b/cake/scripts/bake.php index b3444e25a..01a8379b3 100644 --- a/cake/scripts/bake.php +++ b/cake/scripts/bake.php @@ -24,7 +24,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.scripts + * @subpackage cake.cake.scripts * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$ diff --git a/cake/scripts/test.php b/cake/scripts/test.php index c26061e38..0fb498e5c 100644 --- a/cake/scripts/test.php +++ b/cake/scripts/test.php @@ -23,7 +23,7 @@ * @copyright Copyright (c) 2005, CakePHP Authors/Developers * @link https://trac.cakephp.org/wiki/Authors Authors/Developers * @package cake - * @subpackage cake.scripts + * @subpackage cake.cake.scripts * @since CakePHP v 0.2.9 * @version $Revision$ * @modifiedby $LastChangedBy$