diff --git a/VERSION.txt b/VERSION.txt index 1a3999044..4841a9291 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -6,4 +6,4 @@ // +---------------------------------------------------------------------------------------------------+ // /////////////////////////////////////////////////////////////////////////////////////////////////////////// -0.10.6.1835 RC 2 \ No newline at end of file +0.10.7.1842 RC 2 \ No newline at end of file diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php index a4ae90730..67f6a58a3 100644 --- a/app/config/acl.ini.php +++ b/app/config/acl.ini.php @@ -7,7 +7,7 @@ ; * PHP versions 4 and 5 ; * ; * CakePHP : Rapid Development Framework -; * Copyright (c) 2005, Cake Software Foundation, Inc. +; * Copyright (c) 2006, Cake Software Foundation, Inc. ; * 1785 E. Sahara Avenue, Suite 490-204 ; * Las Vegas, Nevada 89104 ; * @@ -15,7 +15,7 @@ ; * Redistributions of files must retain the above copyright notice. ; * ; * @filesource -; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. +; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. ; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project ; * @package cake ; * @subpackage cake.cake.app.config diff --git a/app/config/core.php b/app/config/core.php index ba73672ac..9c7c3b716 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config diff --git a/app/config/database.php.default b/app/config/database.php.default index 1731609e5..6818afcc6 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -2,22 +2,22 @@ /* SVN FILE: $Id$ */ /** - * This is core configuration file. - * + * This is core configuration file. + * * Use it to configure core behaviour ofCake. * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * * Licensed under The MIT License * Redistributions of files must retain the above copyright notice. * - * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @filesource + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config @@ -30,7 +30,7 @@ /** * In this file you set up your database connection details. - * + * * @package cake * @subpackage cake.config */ @@ -47,6 +47,9 @@ * MySQL set the connect to either mysql_pconnect of mysql_connect * PostgreSQL set the connect to either pg_pconnect of pg_connect * SQLite set the connect to sqlite_popen sqlite_open + * ADOdb set the connect to one of these + * (http://phplens.com/adodb/supported.databases.html) and + * append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent) * * host => * the host you connect to the database diff --git a/app/config/routes.php b/app/config/routes.php index 85a055448..0fe841934 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -11,7 +11,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -19,7 +19,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config diff --git a/app/config/routes.php.default b/app/config/routes.php.default index 413d4a3d4..59e9949fc 100644 --- a/app/config/routes.php.default +++ b/app/config/routes.php.default @@ -11,7 +11,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -19,7 +19,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config diff --git a/app/index.php b/app/index.php index 981a85975..8cfc4e601 100644 --- a/app/index.php +++ b/app/index.php @@ -5,7 +5,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -13,7 +13,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app diff --git a/app/webroot/.htaccess b/app/webroot/.htaccess index 608e639f0..f9d8b938b 100644 --- a/app/webroot/.htaccess +++ b/app/webroot/.htaccess @@ -1,5 +1,6 @@ - RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php?url=$1 [QSA,L] - + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.*)$ index.php?url=$1 [QSA,L] + \ No newline at end of file diff --git a/app/webroot/css.php b/app/webroot/css.php index 555b68cb8..06742edd9 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.webroot diff --git a/app/webroot/index.php b/app/webroot/index.php index 7bf38ed70..144db1955 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.webroot diff --git a/app/webroot/js/vendors.php b/app/webroot/js/vendors.php index f238415b7..5cebc2b07 100644 --- a/app/webroot/js/vendors.php +++ b/app/webroot/js/vendors.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.public.js diff --git a/cake/app_controller.php b/cake/app_controller.php index 7df335152..f5c1a8d3a 100644 --- a/cake/app_controller.php +++ b/cake/app_controller.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake diff --git a/cake/app_model.php b/cake/app_model.php index 116c65454..8ee4252c0 100644 --- a/cake/app_model.php +++ b/cake/app_model.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake diff --git a/cake/basics.php b/cake/basics.php index f1eb125fa..5edd32651 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake diff --git a/cake/bootstrap.php b/cake/bootstrap.php index 8ae0da88d..a7c86e1d1 100644 --- a/cake/bootstrap.php +++ b/cake/bootstrap.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake diff --git a/cake/config/paths.php b/cake/config/paths.php index 01fdb1571..fcd3cb372 100644 --- a/cake/config/paths.php +++ b/cake/config/paths.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config diff --git a/cake/config/tags.ini.php b/cake/config/tags.ini.php index 1e5c171e2..40393f358 100644 --- a/cake/config/tags.ini.php +++ b/cake/config/tags.ini.php @@ -9,7 +9,7 @@ ; * PHP versions 4 and 5 ; * ; * CakePHP : Rapid Development Framework -; * Copyright (c) 2005, Cake Software Foundation, Inc. +; * Copyright (c) 2006, Cake Software Foundation, Inc. ; * 1785 E. Sahara Avenue, Suite 490-204 ; * Las Vegas, Nevada 89104 ; * @@ -18,7 +18,7 @@ ; * ; * @filesource ; * -; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. +; * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. ; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project ; * @package cake ; * @subpackage cake.cake.app.config @@ -82,7 +82,7 @@ file = "" submit = "" ; Tag template for an image tag. -image =" " +image ="" ; Tag template for a table header tag. tableheader = "%s" diff --git a/cake/dispatcher.php b/cake/dispatcher.php index 4d637d8a2..1c7b37910 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake diff --git a/cake/docs/COPYING.txt b/cake/docs/COPYING.txt index c07aa5c94..5ec86b7ae 100644 --- a/cake/docs/COPYING.txt +++ b/cake/docs/COPYING.txt @@ -1,9 +1,9 @@ The MIT License -Copyright: (c) 2005, CakePHP Authors/Developers - Michal Tatarynowicz aka Pies - Larry E. Masters aka PhpNut - Kamil Dzielinski aka Brego +CakePHP : Rapid Development Framework +Copyright (c) 2006, Cake Software Foundation, Inc. + 1785 E. Sahara Avenue, Suite 490-204 + Las Vegas, Nevada 89104 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/cake/docs/GOTCHAS.txt b/cake/docs/GOTCHAS.txt index ded375f2f..8a99a96e0 100644 --- a/cake/docs/GOTCHAS.txt +++ b/cake/docs/GOTCHAS.txt @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////// // +---------------------------------------------------------------------------------------------------+ // -// + $Id:$ +// + $Id$ // + Last Modified:$ // + Modified By:$ // +---------------------------------------------------------------------------------------------------+ // diff --git a/cake/docs/LICENSE.txt b/cake/docs/LICENSE.txt index c07aa5c94..5ec86b7ae 100644 --- a/cake/docs/LICENSE.txt +++ b/cake/docs/LICENSE.txt @@ -1,9 +1,9 @@ The MIT License -Copyright: (c) 2005, CakePHP Authors/Developers - Michal Tatarynowicz aka Pies - Larry E. Masters aka PhpNut - Kamil Dzielinski aka Brego +CakePHP : Rapid Development Framework +Copyright (c) 2006, Cake Software Foundation, Inc. + 1785 E. Sahara Avenue, Suite 490-204 + Las Vegas, Nevada 89104 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/cake/libs/bake.php b/cake/libs/bake.php index ce184422a..2f4d8e654 100644 --- a/cake/libs/bake.php +++ b/cake/libs/bake.php @@ -8,7 +8,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -16,7 +16,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.webroot diff --git a/cake/libs/cache.php b/cake/libs/cache.php index be1f9e35d..3cbc51ce8 100644 --- a/cake/libs/cache.php +++ b/cake/libs/cache.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php index c81fc6dc9..29c3c6943 100644 --- a/cake/libs/class_registry.php +++ b/cake/libs/class_registry.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php index 11109cf03..f574598a7 100644 --- a/cake/libs/controller/component.php +++ b/cake/libs/controller/component.php @@ -7,7 +7,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -15,7 +15,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index c46d6eb49..afd63d38a 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components diff --git a/cake/libs/controller/components/acl_base.php b/cake/libs/controller/components/acl_base.php index e88b7f95f..0ea6ef879 100644 --- a/cake/libs/controller/components/acl_base.php +++ b/cake/libs/controller/components/acl_base.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components diff --git a/cake/libs/controller/components/dbacl/db_acl.php b/cake/libs/controller/components/dbacl/db_acl.php index a882ef114..6293b4bae 100644 --- a/cake/libs/controller/components/dbacl/db_acl.php +++ b/cake/libs/controller/components/dbacl/db_acl.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.controllers.componenets.dbacl diff --git a/cake/libs/controller/components/dbacl/models/aclnode.php b/cake/libs/controller/components/dbacl/models/aclnode.php index 7ed6a55b9..1fcd28d97 100644 --- a/cake/libs/controller/components/dbacl/models/aclnode.php +++ b/cake/libs/controller/components/dbacl/models/aclnode.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models diff --git a/cake/libs/controller/components/dbacl/models/aco.php b/cake/libs/controller/components/dbacl/models/aco.php index fc0b3f010..e06f5bf02 100644 --- a/cake/libs/controller/components/dbacl/models/aco.php +++ b/cake/libs/controller/components/dbacl/models/aco.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models diff --git a/cake/libs/controller/components/dbacl/models/acoaction.php b/cake/libs/controller/components/dbacl/models/acoaction.php index 1a1181e6c..e8627924a 100644 --- a/cake/libs/controller/components/dbacl/models/acoaction.php +++ b/cake/libs/controller/components/dbacl/models/acoaction.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models diff --git a/cake/libs/controller/components/dbacl/models/aro.php b/cake/libs/controller/components/dbacl/models/aro.php index e5f80012f..b93775039 100644 --- a/cake/libs/controller/components/dbacl/models/aro.php +++ b/cake/libs/controller/components/dbacl/models/aro.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models diff --git a/cake/libs/controller/components/dbacl/models/aros_aco.php b/cake/libs/controller/components/dbacl/models/aros_aco.php index 5348ecff5..ccc9c1604 100644 --- a/cake/libs/controller/components/dbacl/models/aros_aco.php +++ b/cake/libs/controller/components/dbacl/models/aros_aco.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models diff --git a/cake/libs/controller/components/iniacl/ini_acl.php b/cake/libs/controller/components/iniacl/ini_acl.php index d5d2e6892..abdeaf564 100644 --- a/cake/libs/controller/components/iniacl/ini_acl.php +++ b/cake/libs/controller/components/iniacl/ini_acl.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.controllers.componenets diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php index 633ec4c19..8a90e2803 100644 --- a/cake/libs/controller/components/session.php +++ b/cake/libs/controller/components/session.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index fb26589a5..6f5d0d5f2 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -7,7 +7,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -15,7 +15,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php index 8362969a2..6d480aa6f 100644 --- a/cake/libs/controller/pages_controller.php +++ b/cake/libs/controller/pages_controller.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index 6d865df0f..acb4ea0d5 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller diff --git a/cake/libs/error.php b/cake/libs/error.php index 9dff7b4b1..50932128d 100644 --- a/cake/libs/error.php +++ b/cake/libs/error.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/file.php b/cake/libs/file.php index 7a934edfd..25c0d60b9 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -8,7 +8,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -16,7 +16,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/flay.php b/cake/libs/flay.php index a1961e0c9..ca39591c9 100644 --- a/cake/libs/flay.php +++ b/cake/libs/flay.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/folder.php b/cake/libs/folder.php index fb4eb14a9..08e4ab5e5 100644 --- a/cake/libs/folder.php +++ b/cake/libs/folder.php @@ -8,7 +8,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -16,7 +16,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs @@ -339,8 +339,6 @@ class Folder extends Object { /** * Create a directory structure recursively. * - * @author Aidan Lister - * @version 1.0.0 * @param string $pathname The directory structure to create * @return bool Returns TRUE on success, FALSE on failure */ @@ -376,8 +374,6 @@ class Folder extends Object { /** * Returns the size in bytes of this Folder. * - * @author Aidan Lister - * @version 1.0.0 * @param string $directory Path to directory */ function dirsize() diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index 1cc442a7e..cb3e24be9 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/legacy.php b/cake/libs/legacy.php index 5177cd021..155d01397 100644 --- a/cake/libs/legacy.php +++ b/cake/libs/legacy.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs @@ -47,8 +47,6 @@ if (!function_exists('file_get_contents')) /** * Replace file_get_contents() * - * @link http://php.net/function.file_get_contents - * @author Aidan Lister * @internal resource_context is not supported * @since PHP 5 * require PHP 4.0.0 (user_error) diff --git a/cake/libs/log.php b/cake/libs/log.php index fc06e6c3a..4b833a0bd 100644 --- a/cake/libs/log.php +++ b/cake/libs/log.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php index 991a24685..34a7a101a 100644 --- a/cake/libs/model/connection_manager.php +++ b/cake/libs/model/connection_manager.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php index 940f150c4..2f1a4c912 100644 --- a/cake/libs/model/datasources/datasource.php +++ b/cake/libs/model/datasources/datasource.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 2eb8e1227..fe28cb781 100644 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources @@ -367,6 +367,7 @@ class DboSource extends DataSource $array = array(); $linkedModels = array(); $this->__bypass = false; + $this->__assocJoins = null; if(!is_null($recursive)) { $model->recursive = $recursive; @@ -384,7 +385,7 @@ class DboSource extends DataSource foreach($model->{$type} as $assoc => $assocData) { $linkModel =& $model->{$assocData['className']}; - if($model->name == $linkModel->name) + if($model->name == $linkModel->name && $type != 'hasAndBelongsToMany' && $type != 'hasMany') { if (true === $this->generateSelfAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, false, $null)) { @@ -422,8 +423,11 @@ class DboSource extends DataSource { foreach($linkModel->{$type1} as $assoc1 => $assocData1) { - $deepModel =& $linkModel->{$assocData1['className']}; - $this->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData, $array, false, $resultSet); + if ($assoc1 != $model->name) + { + $deepModel =& $linkModel->{$assocData1['className']}; + $this->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $array, false, $resultSet); + } } } } @@ -898,7 +902,7 @@ class DboSource extends DataSource } } - if (count($fields) > 1 && $fields[0] != '*') + if (count($fields) >= 1 && $fields[0] != '*') { for ($i = 0; $i < count($fields); $i++) { @@ -1005,7 +1009,7 @@ class DboSource extends DataSource { $this->showLog(); } - $this->disconnect(); + //$this->disconnect(); $this->_conn = NULL; $this->connected = false; } diff --git a/cake/libs/model/dbo/dbo_adodb.php b/cake/libs/model/dbo/dbo_adodb.php index 9bb171195..b26a3941a 100644 --- a/cake/libs/model/dbo/dbo_adodb.php +++ b/cake/libs/model/dbo/dbo_adodb.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo @@ -31,7 +31,8 @@ /** * Include AdoDB files. */ -require_once(VENDORS.'adodb/adodb.inc.php'); +require_once(VENDORS.'adodb'.DS.'adodb.inc.php'); +uses('model'.DS.'datasources'.DS.'dbo_source'); /** * AdoDB DBO implementation. @@ -42,8 +43,15 @@ require_once(VENDORS.'adodb/adodb.inc.php'); * @subpackage cake.cake.libs.model.datasources.dbo * @since CakePHP v 0.2.9 */ -class DBO_AdoDB extends DBO +class DboAdodb extends DboSource { +/** + * Enter description here... + * + * @var unknown_type + */ + var $description = "ADOdb DBO Driver"; + /** * ADOConnection object with which we connect. @@ -58,21 +66,27 @@ class DBO_AdoDB extends DBO * * @param array $config Configuration array for connecting */ - function connect ($config) + function connect () { - if ($this->config = $config) - { - if (isset($config['driver'])) - { - $this->_adodb = NewADOConnection($config['driver']); - - $adodb =& $this->_adodb; - $this->connected = $adodb->Connect($config['host'], $config['login'], $config['password'], $config['database']); - } + $config = $this->config; + $persistent = strrpos($config['connect'], '|p'); + if($persistent === FALSE){ + $adodb_driver = $config['connect']; + $connect = 'Connect'; + } + else{ + $adodb_driver = substr($config['connect'], 0, $persistent); + $connect = 'PConnect'; } - if(!$this->connected){ - // die('Could not connect to DB.'); + $this->_adodb = NewADOConnection($adodb_driver); + $adodb =& $this->_adodb; + + $this->connected = $adodb->$connect($config['host'], $config['login'], $config['password'], $config['database']); + + if(!$this->connected) + { + //die('Could not connect to DB.'); } } @@ -83,7 +97,7 @@ class DBO_AdoDB extends DBO */ function disconnect () { - return $this->_adodb->close(); + return $this->_adodb->Close(); } /** @@ -107,6 +121,61 @@ class DBO_AdoDB extends DBO return $this->_result->FetchRow(); } +/** + * Begin a transaction + * + * @param unknown_type $model + * @return boolean True on success, false on fail + * (i.e. if the database/model does not support transactions). + */ + function begin (&$model) + { + if (parent::begin($model)) + { + if ($this->_adodb->BeginTrans()) + { + $this->__transactionStarted = true; + return true; + } + } + return false; + } + +/** + * Commit a transaction + * + * @param unknown_type $model + * @return boolean True on success, false on fail + * (i.e. if the database/model does not support transactions, + * or a transaction has not started). + */ + function commit (&$model) + { + if (parent::commit($model)) + { + $this->__transactionStarted; + return $this->_adodb->CommitTrans(); + } + return false; + } + +/** + * Rollback a transaction + * + * @param unknown_type $model + * @return boolean True on success, false on fail + * (i.e. if the database/model does not support transactions, + * or a transaction has not started). + */ + function rollback (&$model) + { + if (parent::rollback($model)) + { + return $this->_adodb->RollbackTrans(); + } + return false; + } + /** * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits. * @@ -116,7 +185,7 @@ class DBO_AdoDB extends DBO { $tables = $this->_adodb->MetaTables('TABLES'); - if (!sizeof($tables)>0) { + if (!sizeof($tables) > 0) { trigger_error(ERROR_NO_TABLE_LIST, E_USER_NOTICE); exit; } @@ -184,13 +253,16 @@ class DBO_AdoDB extends DBO } /** - * To-be-implemented. Returns the ID generated from the previous INSERT operation. + * Returns the ID generated from the previous INSERT operation. * * @return int * - * @todo To be implemented. + * @Returns the last autonumbering ID inserted. Returns false if function not supported. */ - function lastInsertId () { die('Please implement DBO::lastInsertId() first.'); } + function lastInsertId () + { + return $this->_adodb->Insert_ID(); + } /** * Returns a LIMIT statement in the correct format for the particular database. diff --git a/cake/libs/model/dbo/dbo_dbo.php b/cake/libs/model/dbo/dbo_dbo.php index 0c1a208a9..27c7e16b3 100644 --- a/cake/libs/model/dbo/dbo_dbo.php +++ b/cake/libs/model/dbo/dbo_dbo.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo diff --git a/cake/libs/model/dbo/dbo_generic.php b/cake/libs/model/dbo/dbo_generic.php index 7966515a3..8fb6f0841 100644 --- a/cake/libs/model/dbo/dbo_generic.php +++ b/cake/libs/model/dbo/dbo_generic.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo diff --git a/cake/libs/model/dbo/dbo_mysql.php b/cake/libs/model/dbo/dbo_mysql.php index 5fb2ed889..0aaad7e76 100644 --- a/cake/libs/model/dbo/dbo_mysql.php +++ b/cake/libs/model/dbo/dbo_mysql.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo @@ -126,7 +126,7 @@ class DboMysql extends DboSource */ function disconnect () { - return mysql_close($this->connection); + return @mysql_close($this->connection); } /** @@ -285,7 +285,7 @@ class DboMysql extends DboSource { $data = mysql_real_escape_string($data, $this->connection); } - if(!empty($data)) + if($data != '') { $return = "'" . $data . "'"; } diff --git a/cake/libs/model/dbo/dbo_pear.php b/cake/libs/model/dbo/dbo_pear.php index d04669db9..07cfcc4f6 100644 --- a/cake/libs/model/dbo/dbo_pear.php +++ b/cake/libs/model/dbo/dbo_pear.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo diff --git a/cake/libs/model/dbo/dbo_postgres.php b/cake/libs/model/dbo/dbo_postgres.php index 71c139539..34a506213 100644 --- a/cake/libs/model/dbo/dbo_postgres.php +++ b/cake/libs/model/dbo/dbo_postgres.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo diff --git a/cake/libs/model/dbo/dbo_sqlite.php b/cake/libs/model/dbo/dbo_sqlite.php index d6286b426..8baabb43f 100644 --- a/cake/libs/model/dbo/dbo_sqlite.php +++ b/cake/libs/model/dbo/dbo_sqlite.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.datasources.dbo diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 7cf991dcf..f4b0bf4e1 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model diff --git a/cake/libs/model/model_php4.php b/cake/libs/model/model_php4.php index 1d4917d07..3bcb4c95f 100644 --- a/cake/libs/model/model_php4.php +++ b/cake/libs/model/model_php4.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model @@ -72,7 +72,7 @@ class Model extends Object * * @var unknown_type * @access public - * @todo Is this still used? -OJ 22 nov 2005 + * @todo Is this still used? -OJ 22 nov 2006 */ var $parent = false; @@ -724,110 +724,119 @@ class Model extends Object { $this->set($data); } - - if ($validate && !$this->validates()) + if($this->beforeSave()) { - return false; - } - - $fields = $values = array(); - - $count = 0; - if(count($this->data) > 1) - { - $weHaveMulti = true; - $joined = false; - } - else - { - $weHaveMulti = false; - } - - foreach ($this->data as $n => $v) - { - if(isset($weHaveMulti) && $count > 0 && count($this->hasAndBelongsToMany) > 0) + if ($validate && !$this->validates()) { - $joined[] = $v; + return false; } - else - { - foreach ($v as $x => $y) - { - if ($this->hasField($x)) - { - $fields[] = $x; - $values[] = $y; + $fields = $values = array(); + $count = 0; - if($x == $this->primaryKey && !is_numeric($y)) - { - $newID = $y; - } - } - } - $count++; - } - } + if(count($this->data) > 1) + { + $weHaveMulti = true; + $joined = false; + } + else + { + $weHaveMulti = false; + } - if (empty($this->id) && $this->hasField('created') && !in_array('created', $fields)) - { - $fields[] = 'created'; - $values[] = date('Y-m-d H:i:s'); - } - if ($this->hasField('modified') && !in_array('modified', $fields)) - { - $fields[] = 'modified'; - $values[] = date('Y-m-d H:i:s'); - } - if ($this->hasField('updated') && !in_array('updated', $fields)) - { - $fields[] = 'updated'; - $values[] = date('Y-m-d H:i:s'); - } + foreach ($this->data as $n => $v) + { + if(isset($weHaveMulti) && $count > 0 && count($this->hasAndBelongsToMany) > 0) + { + $joined[] = $v; + } + else + { + foreach ($v as $x => $y) + { + if ($this->hasField($x)) + { + $fields[] = $x; + $values[] = $y; - if(!$this->exists()) - { - $this->id = false; - } + if($x == $this->primaryKey && !is_numeric($y)) + { + $newID = $y; + } + } + } + $count++; + } + } - if(count($fields)) - { - if(!empty($this->id)) - { - if ($this->db->update($this, $fields, $values)) - { - if(!empty($joined)) - { - $this->__saveMulti($joined, $this->id); - } - $this->data = false; - return true; - } - else - { - return $this->hasAny($this->escapeField($this->primaryKey).' = '.$this->db->value($this->id)); - } - } - else - { - if($this->db->create($this, $fields, $values)) - { - $this->__insertID = $this->db->lastInsertId($this->table, $this->primaryKey); - $this->id = $this->__insertID; - if(!empty($joined)) - { - if(!$this->id > 0 && isset($newID)) - { - $this->id = $newID; - } - $this->__saveMulti($joined, $this->id); - } - return true; - } - else - { - return false; - } - } + if (empty($this->id) && $this->hasField('created') && !in_array('created', $fields)) + { + $fields[] = 'created'; + $values[] = date('Y-m-d H:i:s'); + } + if ($this->hasField('modified') && !in_array('modified', $fields)) + { + $fields[] = 'modified'; + $values[] = date('Y-m-d H:i:s'); + } + if ($this->hasField('updated') && !in_array('updated', $fields)) + { + $fields[] = 'updated'; + $values[] = date('Y-m-d H:i:s'); + } + + if(!$this->exists()) + { + $this->id = false; + } + + if(count($fields)) + { + if(!empty($this->id)) + { + if ($this->db->update($this, $fields, $values)) + { + if(!empty($joined)) + { + $this->__saveMulti($joined, $this->id); + } + $this->afterSave(); + $this->data = false; + return true; + } + else + { + return $this->hasAny($this->escapeField($this->primaryKey).' = '.$this->db->value($this->id)); + } + } + else + { + if($this->db->create($this, $fields, $values)) + { + $this->__insertID = $this->db->lastInsertId($this->table, $this->primaryKey); + $this->id = $this->__insertID; + + if(!empty($joined)) + { + if(!$this->id > 0 && isset($newID)) + { + $this->id = $newID; + } + $this->__saveMulti($joined, $this->id); + } + $this->afterSave(); + $this->data = false; + return true; + } + else + { + return false; + } + } + } + else + { + return false; + } } else { @@ -943,11 +952,9 @@ class Model extends Object return false; } - /** * Returns true if a record that meets given conditions exists * - * @param unknown_type $conditions * @return boolean True if such a record exists */ function hasAny ($conditions = null) @@ -1273,7 +1280,6 @@ class Model extends Object { return $this->db->name($this->name).'.'.$this->db->name($field); } - /** * Returns the current record's ID * @@ -1401,6 +1407,7 @@ class Model extends Object */ function afterSave() { + return true; } /** @@ -1420,6 +1427,7 @@ class Model extends Object */ function afterDelete() { + return true; } } diff --git a/cake/libs/model/model_php5.php b/cake/libs/model/model_php5.php index ad8b87d47..47d874a54 100644 --- a/cake/libs/model/model_php5.php +++ b/cake/libs/model/model_php5.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model @@ -72,7 +72,7 @@ class Model extends Object * * @var unknown_type * @access public - * @todo Is this still used? -OJ 22 nov 2005 + * @todo Is this still used? -OJ 22 nov 2006 */ var $parent = false; @@ -718,110 +718,119 @@ class Model extends Object { $this->set($data); } - - if ($validate && !$this->validates()) + if($this->beforeSave()) { - return false; - } - - $fields = $values = array(); - - $count = 0; - if(count($this->data) > 1) - { - $weHaveMulti = true; - $joined = false; - } - else - { - $weHaveMulti = false; - } - - foreach ($this->data as $n => $v) - { - if(isset($weHaveMulti) && $count > 0 && count($this->hasAndBelongsToMany) > 0) + if ($validate && !$this->validates()) { - $joined[] = $v; + return false; } - else - { - foreach ($v as $x => $y) - { - if ($this->hasField($x)) - { - $fields[] = $x; - $values[] = $y; + $fields = $values = array(); + $count = 0; - if($x == $this->primaryKey && !is_numeric($y)) - { - $newID = $y; - } - } - } - $count++; - } - } + if(count($this->data) > 1) + { + $weHaveMulti = true; + $joined = false; + } + else + { + $weHaveMulti = false; + } - if (empty($this->id) && $this->hasField('created') && !in_array('created', $fields)) - { - $fields[] = 'created'; - $values[] = date('Y-m-d H:i:s'); - } - if ($this->hasField('modified') && !in_array('modified', $fields)) - { - $fields[] = 'modified'; - $values[] = date('Y-m-d H:i:s'); - } - if ($this->hasField('updated') && !in_array('updated', $fields)) - { - $fields[] = 'updated'; - $values[] = date('Y-m-d H:i:s'); - } + foreach ($this->data as $n => $v) + { + if(isset($weHaveMulti) && $count > 0 && count($this->hasAndBelongsToMany) > 0) + { + $joined[] = $v; + } + else + { + foreach ($v as $x => $y) + { + if ($this->hasField($x)) + { + $fields[] = $x; + $values[] = $y; - if(!$this->exists()) - { - $this->id = false; - } + if($x == $this->primaryKey && !is_numeric($y)) + { + $newID = $y; + } + } + } + $count++; + } + } - if(count($fields)) - { - if(!empty($this->id)) - { - if ($this->db->update($this, $fields, $values)) - { - if(!empty($joined)) - { - $this->__saveMulti($joined, $this->id); - } - $this->data = false; - return true; - } - else - { - return $this->hasAny($this->escapeField($this->primaryKey).' = '.$this->db->value($this->id)); - } - } - else - { - if($this->db->create($this, $fields, $values)) - { - $this->__insertID = $this->db->lastInsertId($this->table, $this->primaryKey); - $this->id = $this->__insertID; - if(!empty($joined)) - { - if(!$this->id > 0 && isset($newID)) - { - $this->id = $newID; - } - $this->__saveMulti($joined, $this->id); - } - return true; - } - else - { - return false; - } - } + if (empty($this->id) && $this->hasField('created') && !in_array('created', $fields)) + { + $fields[] = 'created'; + $values[] = date('Y-m-d H:i:s'); + } + if ($this->hasField('modified') && !in_array('modified', $fields)) + { + $fields[] = 'modified'; + $values[] = date('Y-m-d H:i:s'); + } + if ($this->hasField('updated') && !in_array('updated', $fields)) + { + $fields[] = 'updated'; + $values[] = date('Y-m-d H:i:s'); + } + + if(!$this->exists()) + { + $this->id = false; + } + + if(count($fields)) + { + if(!empty($this->id)) + { + if ($this->db->update($this, $fields, $values)) + { + if(!empty($joined)) + { + $this->__saveMulti($joined, $this->id); + } + $this->afterSave(); + $this->data = false; + return true; + } + else + { + return $this->hasAny($this->escapeField($this->primaryKey).' = '.$this->db->value($this->id)); + } + } + else + { + if($this->db->create($this, $fields, $values)) + { + $this->__insertID = $this->db->lastInsertId($this->table, $this->primaryKey); + $this->id = $this->__insertID; + + if(!empty($joined)) + { + if(!$this->id > 0 && isset($newID)) + { + $this->id = $newID; + } + $this->__saveMulti($joined, $this->id); + } + $this->afterSave(); + $this->data = false; + return true; + } + else + { + return false; + } + } + } + else + { + return false; + } } else { @@ -1392,6 +1401,7 @@ class Model extends Object */ function afterSave() { + return true; } /** @@ -1411,6 +1421,7 @@ class Model extends Object */ function afterDelete() { + return true; } } diff --git a/cake/libs/neat_array.php b/cake/libs/neat_array.php index ef303b897..f08b3fc51 100644 --- a/cake/libs/neat_array.php +++ b/cake/libs/neat_array.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/neat_string.php b/cake/libs/neat_string.php index 7fe467ea1..c6a06d0c5 100644 --- a/cake/libs/neat_string.php +++ b/cake/libs/neat_string.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/object.php b/cake/libs/object.php index c5aedaa85..988466667 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -10,7 +10,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -18,7 +18,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/router.php b/cake/libs/router.php index aaf127621..3d3a247c3 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php index a6a690e3a..dcc3c72b4 100644 --- a/cake/libs/sanitize.php +++ b/cake/libs/sanitize.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/security.php b/cake/libs/security.php index f2bc3a063..6c50613fa 100644 --- a/cake/libs/security.php +++ b/cake/libs/security.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/session.php b/cake/libs/session.php index 6af2e8033..1877c553a 100644 --- a/cake/libs/session.php +++ b/cake/libs/session.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/validators.php b/cake/libs/validators.php index 15be92c95..20686e6d4 100644 --- a/cake/libs/validators.php +++ b/cake/libs/validators.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index 7a9bf6467..d8d97980b 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php index c4ad39692..ff828c422 100644 --- a/cake/libs/view/helpers/ajax.php +++ b/cake/libs/view/helpers/ajax.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index e7a8e0e20..8d241912c 100644 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index 7814740a8..065c4c376 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -7,7 +7,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -15,7 +15,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php index 63731aaa5..c758ed4d9 100644 --- a/cake/libs/view/helpers/javascript.php +++ b/cake/libs/view/helpers/javascript.php @@ -7,7 +7,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -15,7 +15,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php index d20333fe1..4a26a3052 100644 --- a/cake/libs/view/helpers/number.php +++ b/cake/libs/view/helpers/number.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php index 808a850eb..d27343ea3 100644 --- a/cake/libs/view/helpers/text.php +++ b/cake/libs/view/helpers/text.php @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php index ac6e14a0e..0d6fc9581 100644 --- a/cake/libs/view/helpers/time.php +++ b/cake/libs/view/helpers/time.php @@ -7,7 +7,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -15,7 +15,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers diff --git a/cake/libs/view/templates/elements/dump.thtml b/cake/libs/view/templates/elements/dump.thtml index 4371389e2..599edcad9 100644 --- a/cake/libs/view/templates/elements/dump.thtml +++ b/cake/libs/view/templates/elements/dump.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.pages diff --git a/cake/libs/view/templates/errors/error404.thtml b/cake/libs/view/templates/errors/error404.thtml index 0073884df..6eae980cb 100644 --- a/cake/libs/view/templates/errors/error404.thtml +++ b/cake/libs/view/templates/errors/error404.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_action.thtml b/cake/libs/view/templates/errors/missing_action.thtml index 17548a2f3..a23425cff 100644 --- a/cake/libs/view/templates/errors/missing_action.thtml +++ b/cake/libs/view/templates/errors/missing_action.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_component_class.thtml b/cake/libs/view/templates/errors/missing_component_class.thtml index 2f8824bf9..7399716ac 100644 --- a/cake/libs/view/templates/errors/missing_component_class.thtml +++ b/cake/libs/view/templates/errors/missing_component_class.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_component_file.thtml b/cake/libs/view/templates/errors/missing_component_file.thtml index 34386b255..8857d010f 100644 --- a/cake/libs/view/templates/errors/missing_component_file.thtml +++ b/cake/libs/view/templates/errors/missing_component_file.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_connection.thtml b/cake/libs/view/templates/errors/missing_connection.thtml index 22a84ec47..346ca8f4a 100644 --- a/cake/libs/view/templates/errors/missing_connection.thtml +++ b/cake/libs/view/templates/errors/missing_connection.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_controller.thtml b/cake/libs/view/templates/errors/missing_controller.thtml index 587de77ae..e612234b2 100644 --- a/cake/libs/view/templates/errors/missing_controller.thtml +++ b/cake/libs/view/templates/errors/missing_controller.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_helper_class.thtml b/cake/libs/view/templates/errors/missing_helper_class.thtml index af6262845..7e1366628 100644 --- a/cake/libs/view/templates/errors/missing_helper_class.thtml +++ b/cake/libs/view/templates/errors/missing_helper_class.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_helper_file.thtml b/cake/libs/view/templates/errors/missing_helper_file.thtml index 15c6882e8..137ff2e6e 100644 --- a/cake/libs/view/templates/errors/missing_helper_file.thtml +++ b/cake/libs/view/templates/errors/missing_helper_file.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_layout.thtml b/cake/libs/view/templates/errors/missing_layout.thtml index d3387762d..9677d082d 100644 --- a/cake/libs/view/templates/errors/missing_layout.thtml +++ b/cake/libs/view/templates/errors/missing_layout.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_scaffolddb.thtml b/cake/libs/view/templates/errors/missing_scaffolddb.thtml index f534eed3f..6823c19d4 100644 --- a/cake/libs/view/templates/errors/missing_scaffolddb.thtml +++ b/cake/libs/view/templates/errors/missing_scaffolddb.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_table.thtml b/cake/libs/view/templates/errors/missing_table.thtml index d5aaf1e01..18eafb59b 100644 --- a/cake/libs/view/templates/errors/missing_table.thtml +++ b/cake/libs/view/templates/errors/missing_table.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/missing_view.thtml b/cake/libs/view/templates/errors/missing_view.thtml index 9dd757b80..744bda36d 100644 --- a/cake/libs/view/templates/errors/missing_view.thtml +++ b/cake/libs/view/templates/errors/missing_view.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/errors/private_action.thtml b/cake/libs/view/templates/errors/private_action.thtml index 5f549fec2..8c82c05b5 100644 --- a/cake/libs/view/templates/errors/private_action.thtml +++ b/cake/libs/view/templates/errors/private_action.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors diff --git a/cake/libs/view/templates/layouts/ajax.thtml b/cake/libs/view/templates/layouts/ajax.thtml index c4a502d7f..4b9624a2b 100644 --- a/cake/libs/view/templates/layouts/ajax.thtml +++ b/cake/libs/view/templates/layouts/ajax.thtml @@ -9,7 +9,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -17,7 +17,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.layouts diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml index 0c46e53b4..0c33b27d7 100644 --- a/cake/libs/view/templates/layouts/default.thtml +++ b/cake/libs/view/templates/layouts/default.thtml @@ -6,7 +6,7 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, Cake Software Foundation, Inc. + * Copyright (c) 2006, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 * @@ -14,7 +14,7 @@ * Redistributions of files must retain the above copyright notice. * * @filesource - * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @copyright Copyright (c) 2006, Cake Software Foundation, Inc. * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.pages @@ -48,7 +48,7 @@