diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php index fa9509d81..a4ae90730 100644 --- a/app/config/acl.ini.php +++ b/app/config/acl.ini.php @@ -2,23 +2,21 @@ ; SVN FILE: $Id$ ;/** ; * Short description for file. -; * +; * ; * ; * PHP versions 4 and 5 ; * ; * CakePHP : Rapid Development Framework -; * Copyright (c) 2005, CakePHP Authors/Developers -; * -; * Author(s): Larry E. Masters aka PhpNut -; * Kamil Dzielinski aka Brego +; * Copyright (c) 2005, 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 -; * @author CakePHP Authors/Developers -; * @copyright Copyright (c) 2005, CakePHP Authors/Developers -; * @link https://trac.cakephp.org/wiki/Authors Authors/Developers +; * @filesource +; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. +; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project ; * @package cake ; * @subpackage cake.cake.app.config ; * @since CakePHP v 0.10.0.1076 @@ -28,12 +26,12 @@ ; * @license http://www.opensource.org/licenses/mit-license.php The MIT License ; */ -; acl.ini.php - Cake ACL Configuration +; acl.ini.php - Cake ACL Configuration ; --------------------------------------------------------------------- -; Use this file to specify user permissions. +; Use this file to specify user permissions. ; aco = access control object (something in your application) ; aro = access request object (something requesting access) -; +; ; User records are added as follows: ; ; [uid] @@ -42,13 +40,13 @@ ; deny = aco4, aco5, aco6 ; ; Group records are added in a similar manner: -; +; ; [gid] ; allow = aco1, aco2, aco3 ; deny = aco4, aco5, aco6 ; ; The allow, deny, and groups sections are all optional. -; NOTE: groups names *cannot* ever be the same as usernames! +; NOTE: groups names *cannot* ever be the same as usernames! ; ; ACL permissions are checked in the following order: ; 1. Check for user denies (and DENY if specified) diff --git a/app/config/core.php b/app/config/core.php index 124832373..efe00aaf4 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -2,26 +2,23 @@ /* 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, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * 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 + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 @@ -37,10 +34,10 @@ * uncomment the line below. * Note: If you do have mod rewrite but prefer the * CakePHP pretty urls, you also have to remove the - * .htaccess files - * release/.htaccess - * release/app/.htaccess - * release/app/webroot/.htaccess + * .htaccess files + * release/.htaccess + * release/app/.htaccess + * release/app/webroot/.htaccess */ //define ('BASE_URL', $_SERVER['SCRIPT_NAME']); @@ -52,7 +49,7 @@ * - 2: full debug with sql * - 3: full debug with sql and dump of the current object * - * In production, the "flash messages" redirect after a time interval. + * In production, the "flash messages" redirect after a time interval. * With the other debug levels you get to click the "flash message" to continue. * */ @@ -79,7 +76,7 @@ define('CAKE_SECURITY', 'high'); * Setting this to cake will save files to /cakedistro/tmp directory * Setting it to php will use the php default save path * Setting it to database will use the database - * + * * */ define('CAKE_SESSION_SAVE', 'php'); @@ -97,7 +94,7 @@ define('CAKE_SESSION_SAVE', 'php'); * The define below is used to turn cake built webservices * on or off. Default setting is off. */ -define('WEBSERVICES', 'on'); +define('WEBSERVICES', 'off'); /** * Compress output CSS (removing comments, whitespace, repeating tags etc.) diff --git a/app/config/database.php.default b/app/config/database.php.default index d65e246de..1731609e5 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 diff --git a/app/config/routes.php b/app/config/routes.php index e2fff7bb3..85a055448 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -11,19 +11,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 diff --git a/app/config/routes.php.default b/app/config/routes.php.default index 3d5fd4418..413d4a3d4 100644 --- a/app/config/routes.php.default +++ b/app/config/routes.php.default @@ -11,19 +11,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 diff --git a/app/index.php b/app/index.php index 97914ce75..981a85975 100644 --- a/app/index.php +++ b/app/index.php @@ -5,19 +5,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app * @since CakePHP v 0.10.0.1076 diff --git a/app/models/put_models_here b/app/models/put_models_here deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/plugins/put_3rd_party_cake_apps_here b/app/plugins/put_3rd_party_cake_apps_here deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/views/put_views_folders_here b/app/views/put_views_folders_here deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/webroot/css.php b/app/webroot/css.php index 45391b754..555b68cb8 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.webroot * @since CakePHP v 0.2.9 diff --git a/app/webroot/css/cake.default.css b/app/webroot/css/cake.default.css index 7736e8500..096f6d21c 100644 --- a/app/webroot/css/cake.default.css +++ b/app/webroot/css/cake.default.css @@ -1,203 +1,195 @@ -body -{ - margin: 4px 30px; - font: 13px "Trebuchet MS",Verdana,Arial,Sans-serif; - background-color: #51230B; - line-height: 18px; +/* CSS Document */ +@import url("cake.forms.css"); + +* { + padding:0; + margin:0; +} +body { + font: 76% Verdana, Arial, Sans-serif; + color: #333; +} +img { + border:0; +} +#wrapper { + text-align:left; +} +#header { + height: 101px; + background: #0D5087 url(../img/cake.header_bg.png) repeat-x left top; + border-bottom: 1px solid #000; +} +#content { + min-height:400px; + background-color: #fff; + padding:2em 4em; +} +#footer { + text-align:center; + padding:1em 0; + font-size:smaller; + border-top:1px solid #333; + background-color: #063260; + color:#fff; + line-height:1.5; +} +#footer a { + color:#fff; } -h1 -{ - margin: 4px; - padding: 0; - color: #71300F; - font-size: 30px; +h1, h2, h3, h4 { +padding-bottom:0.5em; } - -h1 em { - color: #DBA941; +h1 { + font-family:"Trebuchet MS",Verdana,Arial,Sans-serif; +} +h1, a { + color:#DB8101; +} +h1 em, a em { + color:#008BCC; font-style: normal; - font-weight: normal; - font-variant: normal; } -h2 a { - color: #fff; - font-style: normal; - font-weight: normal; - font-variant: normal; -} -h2 a:hover { - color: #DBA941; - font-style: normal; - font-weight: normal; - font-variant: normal; -} - -h2.cake -{ - margin-top: 20px; - margin-bottom: 6px; - padding: 0; - color: #71300F; -} - -h2 em { - color: #DBA941; - font-style: normal; +ul.colored a em +h2 { + font-style: italic; font-weight: bold; - font-variant: normal; + color:#666; } -h3 -{ - margin-top: 20px; - margin-bottom: 6px; - color: #71300F; +a:hover, a:hover em { +color:#A22424; +text-decoration:none; } -acronym -{ - border-bottom: 1px dotted #DBA941; +#content p, #content ul, #content ol { +line-height:1.5; +padding-bottom:1em; +} +ul, ol { +margin-left:3em; } -ul -{ - font-family: Helvetica; - margin-top: 2px; - margin-bottom: 6px; - padding: 2px 30px; +/* tables */ + +table { + width: 100%; + background-color: #fff; + border: 1px solid #333; + clear:both; + margin: 0 0 2em 0; + white-space: normal; } -ul li -{ - list-style-image: url("../img/cake.redbox.gif"); - margin-bottom: 8px; - +th { + background-color: #ccc; + border-top: 1px solid #fff; + border-right: 1px solid #666; + border-bottom: 1px solid #666; + text-align: center; + padding:3px; } -p -{ - font-family: Helvetica; - margin-top: 2px; - margin-left: 4px; - margin-bottom: 6px; +table tr td { + border-right: 1px solid #ccc; + padding:4px 4px; + vertical-align:top; + text-align: center; +} +table tr.altRow td { + background: #f4f4f4; } -#container -{ - margin-bottom: 20px; - border: 5px solid #fff; - background-color: #EBEDEE; +/* scaffold show */ + + +div.related { + clear:both; + display:block; +} +dl { + line-height:2em; + margin:1em; +} +dt { + font-weight: bold; + vertical-align:top; +} +dd { + margin-left:10em; + margin-top:-2em; + vertical-align:top; } -#header -{ - padding: 0px; - height: 114px; - background: #fff url("../img/cake.bg.header.gif") repeat-x; - border-bottom: 1px solid #D2D7D8; - margin-bottom: 16px; - text-align: right; +/* scaffold buttons */ + + +.notice { + color: #DB8101; + background-color: #ddd; + display: block; + padding: 1em; } -#header img -{ - float: left; - vertical-align: middle; - border: 0; -} -#headerNav -{ - float: left; - margin-top: 56px; - margin-left: 20px; - font-size: 15px; - font-weight: bold; - color: #71300F; +.tip { + color: #DB8101; + background-color: #ddd; + display: block; + padding: 1em; } -#headerNav a { - padding: 4px 10px; +ul.actions { + list-style: none; + text-align:left; + margin:2em 0; + padding: 0; } -#headerNav a:hover { - padding: 4px 10px; - background-color: #D2D7D8; +ul.actions li { + margin-left:1em; + list-style: none; + display: inline; } -#headerNav .active { - padding: 4px 10px; - background-color: #fff; +ul.actions li a, ul.actions li input { + padding: 2px 12px; + color: #DB8101; + background-color:#ccc; + text-decoration: none; + border: 1px solid #666; + line-height: 24px; + font-weight: bold; + text-align:center; + text-decoration: none; } -#pageNav { - clear: both; - margin-top: 0px; - margin-right: 30px; - margin-left: 30px; - text-align: right; - font-size: 15px; - font-weight: bold; - color: #71300F; +ul.actions li a:hover { + color: #DB8101; + background-color:#fff; + text-decoration: none; +} +td.listactions { + width: 14em; + text-align: center; + white-space: nowrap; +} +td.listactions a { + padding: 0px 8px; + text-align:center; + font-weight: bold; + color: #DB8101; + background-color:#ccc; + text-decoration: none; + border: 1px solid #666; + white-space: nowrap; +} +td.listactions a:hover { + color: #fff; + background-color:#DB8101; } -#pageNav a { - padding: 4px 10px; - border-top: 1px solid #EBEDEE; - border-left: 1px solid #EBEDEE; - border-right: 1px solid #EBEDEE; +/* index links */ + +ul.colored a { + } -#pageNav a:hover { - padding: 4px 10px; - background-color: #fff; - border-top: 1px solid #D2D7D8; - border-left: 1px solid #D2D7D8; - border-right: 1px solid #D2D7D8; -} -#pageNav .active { - padding: 4px 10px; - background-color: #fff; - border-top: 1px solid #D2D7D8; - border-left: 1px solid #D2D7D8; - border-right: 1px solid #D2D7D8; -} -#content -{ - clear: both; - margin: 2px 20px 20px 20px; - padding: 20px 28px 40px 22px; - background-color: #fff; - border-top: 1px solid #D2D7D8; - border-left: 1px solid #D2D7D8; - border-right: 1px solid #D2D7D8; - border-bottom: 1px solid #D2D7D8; - text-align: left; -} -a -{ - color: #71300F; - text-decoration: none; - font-weight: bold; +ul.colored a em { + } -a:hover -{ - color: #71300F; - text-decoration: underline; - font-weight: bold; -} - -#footer -{ - padding-bottom: 0px; - text-align: right; -} -/***Please Leave Powered by Cake****/ -#pb-cake { - margin-bottom: 20px; - padding-right: 6px; - text-align: center; -} -#pb-cake a { - padding: 0; - border: 0; -} - -div.message { -background-color: #E3FFD1; -border:1px solid #060; -padding:1em; -margin-bottom:1em; -} +a { +font-weight: bold; +} \ No newline at end of file diff --git a/app/webroot/css/cake.forms.css b/app/webroot/css/cake.forms.css index 20545ca8d..8ee223a07 100644 --- a/app/webroot/css/cake.forms.css +++ b/app/webroot/css/cake.forms.css @@ -5,7 +5,7 @@ form { font-size: 120%; border-width: 0px 0px 0px 0px; border-style: solid; - border-color: #71300F; + border-color: #DB8101; } form fieldset { @@ -45,7 +45,6 @@ textarea { form div { clear: left; display: block; - height: expression('1%'); margin: 5px 0px 0px 0px; padding: 1px 3px; } @@ -105,7 +104,7 @@ form div label { display: block; float: left; width: 200px; - background-color: #f4f4f4; + background-color: #f4f4f4; font-size: 16px; padding: 3px 5px; margin: 0px 0px 5px 0px; @@ -123,7 +122,6 @@ form div.required label, label.required { form div label.labelCheckbox, form div label.labelRadio { float: none; display: block; - height: expression('1%'); margin: 0px 0px 5px 142px; text-align: left; } @@ -132,14 +130,13 @@ form div fieldset label.labelCheckbox, form div fieldset label.labelRadio { margin: 0px 0px 5px 0px; } p.error { - color: #71300F; + color: #DB8101; background-color: #DBA941; font-size: 14px; padding: 1em; } form div input, form div select, form div textarea { - background-color: #f4f4f4; padding: 1px 3px; margin: 0px 0px 0px 0px; } @@ -169,7 +166,7 @@ form div.submit { div.submit input { padding: 2px 12px; - color: #71300F; + color: #DB8101; background-color:#ccc; text-decoration: none; border: 1px solid #666; @@ -182,7 +179,7 @@ div.submit input { div.submit input:hover { padding: 2px 12px; color: #fff; - background-color:#71300F; + background-color:#DB8101; text-decoration: none; border: 1px solid #666; font-size: 14px; @@ -202,7 +199,6 @@ form div small { margin: 0px 0px 5px 142px; padding: 1px 3px; font-size: 88%; - height: expression('1%'); } /* form.import.css */ @@ -215,12 +211,6 @@ form input, form select, form textarea { background-color: #fff; } -form textarea.expanding { - overflow: auto; - overflow-x: auto; - overflow-y: visible; -} - div.optional label:before { content: ''; } @@ -228,11 +218,10 @@ div.optional label:before { div.required label:before { content: ''; } - + form div label.labelCheckbox, form div label.labelRadio, label.labelCheckbox, label.labelRadio { display: block; width: 190px; - height: expression('1%'); padding: 4px 0px 0px 18px; text-indent: -18px; line-height: 120%; @@ -245,7 +234,6 @@ form div label.labelCheckbox input.inputCheckbox, form div label.labelRadio inpu form div fieldset input.inputText, form div fieldset input.inputPassword, form div fieldset input.inputFile, form div fieldset textarea.inputTextarea { width: 160px; margin: 0px 0px 0px 18px; - margin: expression('0px 0px 0px -124px'); } form div label.compact { @@ -288,4 +276,4 @@ select.autoWidth { option { padding-left:1em; -} +} \ No newline at end of file diff --git a/app/webroot/css/cake.ie.css b/app/webroot/css/cake.ie.css new file mode 100644 index 000000000..cee4e1734 --- /dev/null +++ b/app/webroot/css/cake.ie.css @@ -0,0 +1,9 @@ +form div, +form div label.labelCheckbox, form div label.labelRadio, +form div small, +form div label.labelCheckbox, form div label.labelRadio, label.labelCheckbox, label.labelRadio { + height: expression('1%'); +} +form div fieldset input.inputText, form div fieldset input.inputPassword, form div fieldset input.inputFile, form div fieldset textarea.inputTextarea { + margin: expression('0px 0px 0px -124px'); +} diff --git a/app/webroot/css/cake.scaffold.css b/app/webroot/css/cake.scaffold.css deleted file mode 100644 index cfae6c54a..000000000 --- a/app/webroot/css/cake.scaffold.css +++ /dev/null @@ -1,155 +0,0 @@ -/* CSS Document */ -h1 -{ - padding: 2px 6px; - color: #fff; - background-color: #71300F; - font-size: 30px; -} -h2 -{ - padding: 1px 6px; - color: #fff; - background-color: #71300F; - font-size: 24px; -} -code, pre { - color:#44a; - font-family:monospace; - font-size:1.15em; -} -code { - color:#227; - margin:0 .2em; - white-space:nowrap; -} -pre { - margin-left:1em; -} -acronym { - border-bottom:1px dotted #666; -} -ul { - margin-top:1em; - list-style:none; -} -li { - margin-left:2em; - list-style:none; - list-style-image: none; -} - -.notice { - color: #71300F; - background-color: #DBA941; - font-family: Verdana; - display: block; - padding: 1em; -} -.tip { - color: #71300F; - font-size: 14px; - background-color: #DBA941; - display: block; - padding: 1em; -} - -ul.actions { - list-style: none; - text-align:left; - margin:2em 0; - padding: 0 0em; -} -ul.actions li { - margin-left:1em; - list-style: none; - display: inline; -} -ul.actions li a, ul.actions li input { - padding: 2px 12px; - color: #71300F; - background-color:#ccc; - text-decoration: none; - border: 1px solid #666; - line-height: 24px; - font-size: 14px; - font-weight: bold; - text-align:center; - text-decoration: none; -} -ul.actions li a:hover { - color: #71300F; - background-color:#fff; - text-decoration: none; -} -td.listactions { - width: 14em; - text-align: center; - white-space: nowrap; -} -td.listactions a { - - padding: 0px 8px; - text-align:center; - font-size: 14px; - font-weight: bold; - color: #71300F; - background-color:#ccc; - text-decoration: none; - border: 1px solid #666; - -} -td.listactions a:hover { - padding: 0px 8px; - text-align:center; - font-size: 14px; - font-weight: bold; - color: #fff; - background-color:#71300F; - text-decoration: none; - border: 1px solid #666; - white-space: nowrap; -} -table { - width: 100%; - background-color: #fff; - border: 1px solid #333; - clear:both; - margin: 0em 0 2em 0; - white-space: normal; -} -th { - background-color: #ccc; - border-top: 1px solid #fff; - border-right: 1px solid #666; - border-bottom: 1px solid #666; - text-align: center; - padding:3px; -} -table tr td { - border-right: 1px solid #ccc; - padding:4px 4px; - font-size: 12px; - vertical-align:top; - text-align: center; -} -table tr.altRow td { - background: #f4f4f4; -} -div.related { - clear:both; - display:block; -} -dl { - line-height:2em; - margin:1em; -} -dt { - font-weight: bold; - vertical-align:top; -} -dd { - margin-left:10em; - margin-top:-2em; - vertical-align:top; -} \ No newline at end of file diff --git a/app/webroot/favicon.ico b/app/webroot/favicon.ico index eb730159e..8c5c557bf 100644 Binary files a/app/webroot/favicon.ico and b/app/webroot/favicon.ico differ diff --git a/app/webroot/files/put_downloadable_files_here b/app/webroot/files/put_downloadable_files_here deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/webroot/img/cake.bg.body.gif b/app/webroot/img/cake.bg.body.gif deleted file mode 100644 index eed1a758f..000000000 Binary files a/app/webroot/img/cake.bg.body.gif and /dev/null differ diff --git a/app/webroot/img/cake.bg.header.gif b/app/webroot/img/cake.bg.header.gif deleted file mode 100644 index 1fb90c874..000000000 Binary files a/app/webroot/img/cake.bg.header.gif and /dev/null differ diff --git a/app/webroot/img/cake.header_bg.png b/app/webroot/img/cake.header_bg.png new file mode 100644 index 000000000..dcf1b7d05 Binary files /dev/null and b/app/webroot/img/cake.header_bg.png differ diff --git a/app/webroot/img/cake.logo.png b/app/webroot/img/cake.logo.png index c9894d539..4d9a3a148 100644 Binary files a/app/webroot/img/cake.logo.png and b/app/webroot/img/cake.logo.png differ diff --git a/app/webroot/img/cake.power.png b/app/webroot/img/cake.power.png index 627ed1f44..699ef80fd 100644 Binary files a/app/webroot/img/cake.power.png and b/app/webroot/img/cake.power.png differ diff --git a/app/webroot/img/cake.redbox.gif b/app/webroot/img/cake.redbox.gif deleted file mode 100644 index 71001c19a..000000000 Binary files a/app/webroot/img/cake.redbox.gif and /dev/null differ diff --git a/app/webroot/img/pbcake.gif b/app/webroot/img/pbcake.gif deleted file mode 100644 index 7739878e0..000000000 Binary files a/app/webroot/img/pbcake.gif and /dev/null differ diff --git a/app/webroot/img/w3c_css.png b/app/webroot/img/w3c_css.png new file mode 100644 index 000000000..706325e1c Binary files /dev/null and b/app/webroot/img/w3c_css.png differ diff --git a/app/webroot/img/w3c_xhtml10.png b/app/webroot/img/w3c_xhtml10.png new file mode 100644 index 000000000..ec686442c Binary files /dev/null and b/app/webroot/img/w3c_xhtml10.png differ diff --git a/app/webroot/index.php b/app/webroot/index.php index 897f4ff08..f16da5cda 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -3,25 +3,22 @@ /** * The main "loop" - * + * * Long description for file * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * 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 + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.webroot * @since CakePHP v 0.2.9 @@ -106,7 +103,7 @@ require_once LIBS.'inflector.php'; else { $url = empty($_GET['url'])? null: $_GET['url']; - } + } if (strpos($url, 'ccss/') === 0) @@ -114,10 +111,10 @@ if (strpos($url, 'ccss/') === 0) include WWW_ROOT.DS.'css.php'; die(); } - + DEBUG? error_reporting(E_ALL): error_reporting(0); -if (DEBUG) +if (DEBUG) { ini_set('display_errors', 1); } diff --git a/app/webroot/js/vendors.php b/app/webroot/js/vendors.php index 0ece98bfa..f238415b7 100644 --- a/app/webroot/js/vendors.php +++ b/app/webroot/js/vendors.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.public.js * @since CakePHP v 0.2.9 diff --git a/cake/app_controller.php b/cake/app_controller.php index 196aca615..7df335152 100644 --- a/cake/app_controller.php +++ b/cake/app_controller.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake * @since CakePHP v 0.2.9 diff --git a/cake/app_model.php b/cake/app_model.php index 72100979f..116c65454 100644 --- a/cake/app_model.php +++ b/cake/app_model.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake * @since CakePHP v 0.2.9 diff --git a/cake/basics.php b/cake/basics.php index c98bf96fe..8bc2165ec 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake * @since CakePHP v 0.2.9 diff --git a/cake/config/inflections/nouns.php b/cake/config/inflections/nouns.php index 0d95d2794..85ea6a3a5 100644 --- a/cake/config/inflections/nouns.php +++ b/cake/config/inflections/nouns.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.config.inflections * @since CakePHP v .0.10.x.x diff --git a/cake/config/paths.php b/cake/config/paths.php index 732d6ca85..544905547 100644 --- a/cake/config/paths.php +++ b/cake/config/paths.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.config * @since CakePHP v 0.2.9 diff --git a/cake/config/tags.ini.php b/cake/config/tags.ini.php index 40b465ad0..1e5c171e2 100644 --- a/cake/config/tags.ini.php +++ b/cake/config/tags.ini.php @@ -2,26 +2,24 @@ ; SVN FILE: $Id$ ;/** ; * Short description for file. -; * +; * ; * In this file, you can set up 'templates' for every tag generated by the tag ; * generator. ; * ; * PHP versions 4 and 5 ; * ; * CakePHP : Rapid Development Framework -; * Copyright (c) 2005, CakePHP Authors/Developers -; * -; * Author(s): Michal Tatarynowicz aka Pies -; * Larry E. Masters aka PhpNut -; * Kamil Dzielinski aka Brego +; * Copyright (c) 2005, 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 -; * @author CakePHP Authors/Developers -; * @copyright Copyright (c) 2005, CakePHP Authors/Developers -; * @link https://trac.cakephp.org/wiki/Authors Authors/Developers +; * @filesource +; * +; * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. +; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project ; * @package cake ; * @subpackage cake.cake.app.config ; * @since CakePHP v 0.10.0.1076 @@ -35,25 +33,25 @@ ; Tag template for a link. link = "%s" -; Tag template for a mailto: link. +; Tag template for a mailto: link. mailto = "%s" -; Tag template for opening form tag. +; Tag template for opening form tag. form = "
" -; Tag template for an input type='text' tag. +; Tag template for an input type='text' tag. input = "" ; Tag template for an input type='textarea' tag textarea = "" -; Tag template for an input type='hidden' tag. +; Tag template for an input type='hidden' tag. hidden = "" ; Tag template for a textarea tag. textarea = "" -; Tag template for a input type='checkbox ' tag. +; Tag template for a input type='checkbox ' tag. checkbox = "" ; Tag template for a input type='radio' tag. @@ -71,34 +69,34 @@ selectempty = "" ; Tag template for a select option tag. selectoption = "" -; Tag template for a closing select tag. +; Tag template for a closing select tag. selectend = "" ; Tag template for a password tag. password = "" -; Tag template for a file input tag. +; Tag template for a file input tag. file = "" -; Tag template for a submit button tag. +; Tag template for a submit button tag. submit = "" ; Tag template for an image tag. image =" " -; Tag template for a table header tag. +; Tag template for a table header tag. tableheader = "%s" ; Tag template for table headers row tag. tableheaderrow = "%s" -; Tag template for a table cell tag. +; Tag template for a table cell tag. tablecell = "%s" -; Tag template for a table row tag. +; Tag template for a table row tag. tablerow = "%s" -; Tag template for a CSS link tag. +; Tag template for a CSS link tag. css = "" ; Tag template for a charset meta-tag. diff --git a/cake/dispatcher.php b/cake/dispatcher.php index 6be64055e..7dfee8463 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake * @since CakePHP v 0.2.9 @@ -267,10 +264,8 @@ class Dispatcher extends Object } $params['bare'] = empty($params['ajax'])? (empty($params['bare'])? 0: 1): 1; - if(defined('WEBSERVICES')) - { - $params['webservices'] = empty($params['webservices']) ? null : $params['webservices']; - } + $params['webservices'] = empty($params['webservices']) ? null : $params['webservices']; + return $params; } diff --git a/cake/libs/cache.php b/cake/libs/cache.php index 76d379fbd..d892c0f54 100644 --- a/cake/libs/cache.php +++ b/cake/libs/cache.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php index bf36d60a2..9ee2805cf 100644 --- a/cake/libs/class_registry.php +++ b/cake/libs/class_registry.php @@ -9,17 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * Author(s): Larry E. Masters aka PhpNut - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.9.2 diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php index f79233e5c..7d7ea7a47 100644 --- a/cake/libs/controller/component.php +++ b/cake/libs/controller/component.php @@ -7,17 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * Author(s): Larry E. Masters aka PhpNut - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller * @since CakePHP v TBD diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index f0bdb44c9..dd056d777 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/controller/components/acl_base.php b/cake/libs/controller/components/acl_base.php index cf0d584fb..4e579ceec 100644 --- a/cake/libs/controller/components/acl_base.php +++ b/cake/libs/controller/components/acl_base.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/components/dbacl/db_acl.php b/cake/libs/controller/components/dbacl/db_acl.php index 5656f1393..44e39259f 100644 --- a/cake/libs/controller/components/dbacl/db_acl.php +++ b/cake/libs/controller/components/dbacl/db_acl.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.controllers.componenets.dbacl * @since CakePHP v 0.2.9 diff --git a/cake/libs/controller/components/dbacl/models/aclnode.php b/cake/libs/controller/components/dbacl/models/aclnode.php index fd332368c..b257c5c68 100644 --- a/cake/libs/controller/components/dbacl/models/aclnode.php +++ b/cake/libs/controller/components/dbacl/models/aclnode.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/components/dbacl/models/aco.php b/cake/libs/controller/components/dbacl/models/aco.php index 8edb77cfe..09df6797a 100644 --- a/cake/libs/controller/components/dbacl/models/aco.php +++ b/cake/libs/controller/components/dbacl/models/aco.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/components/dbacl/models/acoaction.php b/cake/libs/controller/components/dbacl/models/acoaction.php index 207604c14..1c99d0ded 100644 --- a/cake/libs/controller/components/dbacl/models/acoaction.php +++ b/cake/libs/controller/components/dbacl/models/acoaction.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/components/dbacl/models/aro.php b/cake/libs/controller/components/dbacl/models/aro.php index 28d7f2431..26e553751 100644 --- a/cake/libs/controller/components/dbacl/models/aro.php +++ b/cake/libs/controller/components/dbacl/models/aro.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/components/dbacl/models/aros_aco.php b/cake/libs/controller/components/dbacl/models/aros_aco.php index 81db83a21..9300d7d8a 100644 --- a/cake/libs/controller/components/dbacl/models/aros_aco.php +++ b/cake/libs/controller/components/dbacl/models/aros_aco.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components.dbacl.models * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/components/iniacl/ini_acl.php b/cake/libs/controller/components/iniacl/ini_acl.php index 26fc4bfd1..078d0be45 100644 --- a/cake/libs/controller/components/iniacl/ini_acl.php +++ b/cake/libs/controller/components/iniacl/ini_acl.php @@ -9,19 +9,16 @@ * 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. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.app.controllers.componenets * @since CakePHP v 0.2.9 @@ -42,23 +39,23 @@ uses('controller/components/acl_base'); class INI_ACL extends AclBase { - /** - * The constructor must be overridden, as AclBase is abstract. - * - */ +/** + * The constructor must be overridden, as AclBase is abstract. + * + */ function __construct() { } - /** - * Main ACL check function. Checks to see if the ARO (access request object) has access to the ACO (access control object). - * Looks at the acl.ini.php file for permissions (see instructions in /config/acl.ini.php). - * - * @param string $aro - * @param string $aco - * @return boolean - */ +/** + * Main ACL check function. Checks to see if the ARO (access request object) has access to the ACO (access control object). + * Looks at the acl.ini.php file for permissions (see instructions in /config/acl.ini.php). + * + * @param string $aro + * @param string $aco + * @return boolean + */ function check($aro, $aco, $aco_action = null) { $aclConfig = $this->readConfigFile(CONFIGS . 'acl.ini.php'); @@ -124,12 +121,12 @@ class INI_ACL extends AclBase return false; } - /** - * Parses an INI file and returns an array that reflects the INI file's section structure. Double-quote friendly. - * - * @param string $fileName - * @return array - */ +/** + * Parses an INI file and returns an array that reflects the INI file's section structure. Double-quote friendly. + * + * @param string $fileName + * @return array + */ function readConfigFile ($fileName) { $fileLineArray = file($fileName); @@ -174,12 +171,12 @@ class INI_ACL extends AclBase return $iniSetting; } - /** - * Removes trailing spaces on all array elements (to prepare for searching) - * - * @param array $array - * @return array - */ +/** + * Removes trailing spaces on all array elements (to prepare for searching) + * + * @param array $array + * @return array + */ function arrayTrim($array) { foreach($array as $element) { diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php index ec49f5d08..91a73177b 100644 --- a/cake/libs/controller/components/session.php +++ b/cake/libs/controller/components/session.php @@ -9,17 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.components * @since CakePHP v 0.10.0.1232 diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index 75a28ff89..fb29d986e 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -7,19 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller * @since CakePHP v 0.2.9 @@ -573,9 +570,9 @@ class Controller extends Object foreach( $pass as $key=>$value ) { - if( $alias.$key == $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) + if( $alias.$key == $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] && isset( $value[$otherModel->primaryKey] ) && isset( $value[$otherDisplayField] ) ) { - $fieldNames[ $tabl['name']]['options'][$value['id']] = $value[$otherDisplayField]; + $fieldNames[ $tabl['name']]['options'][$value[$otherModel->primaryKey]] = $value[$otherDisplayField]; } } } @@ -612,7 +609,9 @@ class Controller extends Object //BUGBUG: Need a better way to determine if this field is an auto increment foreign key. // If it is a number, and it is a foreign key, we'll make a HUGE assumption that it is an auto increment field. // for foreign key autonumber fields, we'll set the type to 'key' so that it does not display in the input form. - if( 0 == strncmp($tabl['name'], 'id', 2) ) + + $charCount = strlen($this->$model->primaryKey); + if( 0 == strncmp($tabl['name'], $this->$model->primaryKey, $charCount) ) { $fieldNames[ $tabl['name']]['type'] = 'hidden'; } @@ -635,9 +634,9 @@ class Controller extends Object { foreach( $pass as $key=>$value ) { - if( $alias.$key == $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) + if( $alias.$key == $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] && isset( $value[$otherModel->primaryKey] ) && isset( $value[$otherDisplayField] ) ) { - $fieldNames[ $tabl['name']]['options'][$value['id']] = $value[$otherDisplayField]; + $fieldNames[ $tabl['name']]['options'][$value[$otherModel->primaryKey]] = $value[$otherDisplayField]; } } } @@ -703,9 +702,9 @@ class Controller extends Object { foreach( $pass as $key=>$value ) { - if( $key == $modelName && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) + if( $key == $modelName && isset( $value[$modelObject->primaryKey] ) && isset( $value[$otherDisplayField] ) ) { - $fieldNames[$modelKeyM]['options'][$value['id']] = $value[$otherDisplayField]; + $fieldNames[$modelKeyM]['options'][$value[$modelObject->primaryKey]] = $value[$otherDisplayField]; } } } @@ -713,7 +712,7 @@ class Controller extends Object { foreach( $data[$manyAssociation] as $key => $row ) { - $fieldNames[$modelKeyM]['selected'][$row['id']] = $row['id']; + $fieldNames[$modelKeyM]['selected'][$row[$modelObject->primaryKey]] = $row[$modelObject->primaryKey]; } } } diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php index ec56c79f9..4bbd64ea7 100644 --- a/cake/libs/controller/pages_controller.php +++ b/cake/libs/controller/pages_controller.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller * @since CakePHP v 0.2.9 diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index f0e55e6c7..6044e1115 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller * @since Cake v 0.10.0.1076 diff --git a/cake/libs/controller/templates/scaffolds/edit.thtml b/cake/libs/controller/templates/scaffolds/edit.thtml index 5fa6f76b4..85855be11 100644 --- a/cake/libs/controller/templates/scaffolds/edit.thtml +++ b/cake/libs/controller/templates/scaffolds/edit.thtml @@ -7,18 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.templates.scaffolds * @since CakePHP v 0.10.0.1076 @@ -30,25 +28,26 @@ $modelName = Inflector::singularize($this->name); $modelKey = $modelName; - + ?>

Edit

formTag('/'. Inflector::underscore($this->name) .'/update'); - + echo $form->generateFields( $fieldNames ); - + echo $form->generateSubmitDiv( 'Save' ) ?> +
    ".$html->linkTo('Delete '.Inflector::humanize($modelName), '/'.$this->viewPath.'/destroy/'.$data[$modelKey]['id']).""; + echo "
  • ".$html->linkTo('Delete '.Inflector::humanize($modelName), '/'.$this->viewPath.'/destroy/'.$data[$modelKey][$this->controller->{$modelName}->primaryKey])."
    • "; echo "
  • ".$html->linkTo('List '.Inflector::humanize($modelName), '/'.$this->viewPath.'/index')."
    • "; - foreach( $fieldNames as $field => $value ) { + foreach( $fieldNames as $field => $value ) { if( isset( $value['foreignKey'] ) ) { echo "
  • ".$html->linkTo( "View ".Inflector::humanize($value['controller']), "/".Inflector::underscore($value['controller'])."/show/".$data[$modelKey][$field] )."
    • "; diff --git a/cake/libs/controller/templates/scaffolds/list.thtml b/cake/libs/controller/templates/scaffolds/list.thtml index 467aec324..d79f84a73 100644 --- a/cake/libs/controller/templates/scaffolds/list.thtml +++ b/cake/libs/controller/templates/scaffolds/list.thtml @@ -7,18 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.templates.scaffolds * @since CakePHP v 0.10.0.1076 @@ -80,9 +78,9 @@ } ?> value ?> - linkTo('View',"/".$this->viewPath."/show/{$row[$modelKey]['id']}/")?> - linkTo('Edit',"/".$this->viewPath."/edit/{$row[$modelKey]['id']}/")?> - linkTo('Delete',"/".$this->viewPath."/destroy/{$row[$modelKey]['id']}/")?> + linkTo('View',"/".$this->viewPath."/show/{$row[$modelKey][$this->controller->{$model}->primaryKey]}/")?> + linkTo('Edit',"/".$this->viewPath."/edit/{$row[$modelKey][$this->controller->{$model}->primaryKey]}/")?> + linkTo('Delete',"/".$this->viewPath."/destroy/{$row[$modelKey][$this->controller->{$model}->primaryKey]}/")?> diff --git a/cake/libs/controller/templates/scaffolds/new.thtml b/cake/libs/controller/templates/scaffolds/new.thtml index d02fdb409..030e4131e 100644 --- a/cake/libs/controller/templates/scaffolds/new.thtml +++ b/cake/libs/controller/templates/scaffolds/new.thtml @@ -7,18 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.templates.scaffolds * @since CakePHP v 0.10.0.1076 @@ -36,8 +34,8 @@ echo $form->generateFields( $fieldNames ); echo $form->generateSubmitDiv( 'Add' ) - ?> +
      ".$html->linkTo('List '.Inflector::humanize($this->name), '/'.$this->viewPath.'/index').""; diff --git a/cake/libs/controller/templates/scaffolds/show.thtml b/cake/libs/controller/templates/scaffolds/show.thtml index 962225516..755e49302 100644 --- a/cake/libs/controller/templates/scaffolds/show.thtml +++ b/cake/libs/controller/templates/scaffolds/show.thtml @@ -7,18 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.controller.templates.scaffolds * @since CakePHP v 0.10.0.1076 @@ -48,7 +46,7 @@ $otherModelObject = $registry->getObject(Inflector::underscore($objModel->tableToModel[$value['table']])); $displayField = $otherModelObject->getDisplayField(); $displayText = $data[$alias][$displayField]; - + if(!empty($data[$objModel->tableToModel[$objModel->table]][$field])) { echo "
      ".$html->linkTo($displayText, '/'.Inflector::underscore($value['controller']).'/show/' @@ -71,20 +69,20 @@ echo "
       
      "; } } - } + } ?>
        ".$html->linkTo('Edit '.Inflector::humanize($objModel->name), '/'.$this->viewPath.'/edit/'.$data[$objModel->tableToModel[$objModel->table]]['id']).""; - echo "
      • ".$html->linkTo('Delete '.Inflector::humanize($objModel->name), '/'.$this->viewPath.'/destroy/'.$data[$objModel->tableToModel[$objModel->table]]['id'])."
        • "; + echo "
      • ".$html->linkTo('Edit '.Inflector::humanize($objModel->name), '/'.$this->viewPath.'/edit/'.$data[$objModel->tableToModel[$objModel->table]][$this->controller->{$modelName}->primaryKey])."
        • "; + echo "
      • ".$html->linkTo('Delete '.Inflector::humanize($objModel->name), '/'.$this->viewPath.'/destroy/'.$data[$objModel->tableToModel[$objModel->table]][$this->controller->{$modelName}->primaryKey])."
        • "; echo "
      • ".$html->linkTo('List '.Inflector::humanize($objModel->name), '/'.$this->viewPath.'/index')."
        • "; echo "
      • ".$html->linkTo('New '.Inflector::humanize($objModel->name), '/'.$this->viewPath.'/add')."
        • "; - foreach( $fieldNames as $field => $value ) { + foreach( $fieldNames as $field => $value ) { if( isset( $value['foreignKey'] ) ) { - echo "
      • ".$html->linkTo( "View ".Inflector::humanize($value['controller']), "/".Inflector::underscore($value['controller'])."/show/".$data[$alias]['id'] )."
        • "; + echo "
      • ".$html->linkTo( "View ".Inflector::humanize($value['controller']), "/".Inflector::underscore($value['controller'])."/show/".$data[$alias][$otherModelObject->primaryKey] )."
        • "; } } ?> @@ -97,10 +95,10 @@ list($association, $model, $value) = $relation; $otherModelName = $objModel->tableToModel[$model]; $controller = Inflector::pluralize($model); - + echo "

        Related ".Inflector::humanize($association)."

        "; echo "
        "; - if( isset($data[$association]) && is_array($data[$association]) ) + if( isset($data[$association]) && is_array($data[$association]) ) { foreach( $data[$association] as $field=>$value ) { @@ -111,23 +109,23 @@ } else { echo "
         
        "; } - } - + } + } echo "
        "; - echo "
        • ".$html->linkTo('Edit '.Inflector::humanize($association),"/".Inflector::underscore($controller)."/edit/{$data[$association]['id']}")."
        "; + echo "
        • ".$html->linkTo('Edit '.Inflector::humanize($association),"/".Inflector::underscore($controller)."/edit/{$data[$association][$otherModelObject->primaryKey]}")."
        "; } ?> _oneToMany as $relation ) + foreach( $objModel->_oneToMany as $relation ) { $relations[] = $relation; } // end loop through onetomany relations. - foreach( $objModel->_manyToMany as $relation ) + foreach( $objModel->_manyToMany as $relation ) { $relations[] = $relation; } // end loop through manytomany relations. @@ -140,12 +138,12 @@ $controller = Inflector::pluralize($model); echo "

        Related ".Inflector::humanize(Inflector::pluralize($association))."

        "; - if( isset($data[$association]) && is_array($data[$association]) ) + if( isset($data[$association]) && is_array($data[$association]) ) { ?> - + - + "; - foreach( $row as $column=>$value ) + foreach( $row as $column=>$value ) { echo ""; } ?> - "; } } ?> - +
        ".$value."linkTo('View',"/".Inflector::underscore($controller)."/show/{$row['id']}/")?> - linkTo('Edit',"/".Inflector::underscore($controller)."/edit/{$row['id']}/")?> - linkTo('Delete',"/".Inflector::underscore($controller)."/destroy/{$row['id']}/")?> + linkTo('View',"/".Inflector::underscore($controller)."/show/{$row[$this->controller->{$modelName}->{$association}->primaryKey]}/")?> + linkTo('Edit',"/".Inflector::underscore($controller)."/edit/{$row[$this->controller->{$modelName}->{$association}->primaryKey]}/")?> + linkTo('Delete',"/".Inflector::underscore($controller)."/destroy/{$row[$this->controller->{$modelName}->{$association}->primaryKey]}/")?>
          ".$html->linkTo('New '.Inflector::humanize($association),"/".Inflector::underscore($controller)."/add/").""; - // echo "
        • ".$html->linkTo( "View ".Inflector::humanize($table), "/".Inflector::underscore($table)."/list/".$modelName."/".$data[$modelName]['id'])."
          • "; ?>
        diff --git a/cake/libs/error_messages.php b/cake/libs/error_messages.php index c0f756d86..02b3da015 100644 --- a/cake/libs/error_messages.php +++ b/cake/libs/error_messages.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/file.php b/cake/libs/file.php index 57f985e8f..54befdb21 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -8,19 +8,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/flay.php b/cake/libs/flay.php index 2eceda089..b84db8245 100644 --- a/cake/libs/flay.php +++ b/cake/libs/flay.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/folder.php b/cake/libs/folder.php index 3bb1a3def..2c3b9dc22 100644 --- a/cake/libs/folder.php +++ b/cake/libs/folder.php @@ -8,19 +8,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/generator/base.php b/cake/libs/generator/base.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/base.php +++ b/cake/libs/generator/base.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/commands.php b/cake/libs/generator/commands.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/commands.php +++ b/cake/libs/generator/commands.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/generators/applications/app/app_generator.php b/cake/libs/generator/generators/applications/app/app_generator.php index 2475c63d3..afd2e258e 100644 --- a/cake/libs/generator/generators/applications/app/app_generator.php +++ b/cake/libs/generator/generators/applications/app/app_generator.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.applications.app * @since CakePHP v TBD 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 11439ad4c..4469ac9d0 100644 --- a/cake/libs/generator/generators/class_templates/controller/controller_generator.php +++ b/cake/libs/generator/generators/class_templates/controller/controller_generator.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.controller * @since CakePHP v TBD diff --git a/cake/libs/generator/generators/class_templates/controller/templates/component.php b/cake/libs/generator/generators/class_templates/controller/templates/component.php index 2c66bce20..147d41a80 100644 --- a/cake/libs/generator/generators/class_templates/controller/templates/component.php +++ b/cake/libs/generator/generators/class_templates/controller/templates/component.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.controller.templates * @since CakePHP v TBD 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 2c66bce20..147d41a80 100644 --- a/cake/libs/generator/generators/class_templates/controller/templates/controller.php +++ b/cake/libs/generator/generators/class_templates/controller/templates/controller.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.controller.templates * @since CakePHP v TBD 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 2c66bce20..147d41a80 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.controller.templates * @since CakePHP v TBD 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 09b7680da..dd3f41c76 100644 --- a/cake/libs/generator/generators/class_templates/model/model_generator.php +++ b/cake/libs/generator/generators/class_templates/model/model_generator.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.model * @since CakePHP v TBD 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 725853406..7b195f127 100644 --- a/cake/libs/generator/generators/class_templates/model/templates/fixtures.php +++ b/cake/libs/generator/generators/class_templates/model/templates/fixtures.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.model.templates * @since CakePHP v TBD 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 725853406..7b195f127 100644 --- a/cake/libs/generator/generators/class_templates/model/templates/model.php +++ b/cake/libs/generator/generators/class_templates/model/templates/model.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.model.templates * @since CakePHP v TBD 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 725853406..7b195f127 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.model.templates * @since CakePHP v TBD 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 bf7bc93e5..aed63ab8b 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php +++ b/cake/libs/generator/generators/class_templates/scaffold/scaffold_generator.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold * @since CakePHP v TBD 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 8524c2bfc..b95056eac 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/controller.php +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/controller.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/form.thtml @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/helper.php +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/helper.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 100644 --- a/cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml +++ b/cake/libs/generator/generators/class_templates/scaffold/templates/layout.thtml @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD 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 8524c2bfc..b95056eac 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.scaffold.templates * @since CakePHP v TBD diff --git a/cake/libs/generator/generators/class_templates/view/templates/helper.php b/cake/libs/generator/generators/class_templates/view/templates/helper.php index b9eb56cc6..6b5656d35 100644 --- a/cake/libs/generator/generators/class_templates/view/templates/helper.php +++ b/cake/libs/generator/generators/class_templates/view/templates/helper.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.view.templates * @since CakePHP v TBD diff --git a/cake/libs/generator/generators/class_templates/view/templates/view.thtml b/cake/libs/generator/generators/class_templates/view/templates/view.thtml index 193260c0b..c738fe53e 100644 --- a/cake/libs/generator/generators/class_templates/view/templates/view.thtml +++ b/cake/libs/generator/generators/class_templates/view/templates/view.thtml @@ -7,19 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.view.templates * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/generator/generators/class_templates/view/view_generator.php b/cake/libs/generator/generators/class_templates/view/view_generator.php index b9eb56cc6..6b5656d35 100644 --- a/cake/libs/generator/generators/class_templates/view/view_generator.php +++ b/cake/libs/generator/generators/class_templates/view/view_generator.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.view.templates * @since CakePHP v TBD 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 34f623d07..d3f9ccd68 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.web.templates * @since CakePHP v TBD 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 34f623d07..d3f9ccd68 100644 --- a/cake/libs/generator/generators/class_templates/web/templates/controller.php +++ b/cake/libs/generator/generators/class_templates/web/templates/controller.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.web.templates * @since CakePHP v TBD 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 34f623d07..d3f9ccd68 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 @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.web.templates * @since CakePHP v TBD 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 eefe3aea8..41a4bb25c 100644 --- a/cake/libs/generator/generators/class_templates/web/web_generator.php +++ b/cake/libs/generator/generators/class_templates/web/web_generator.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.generators.class_templates.web * @since CakePHP v TBD diff --git a/cake/libs/generator/lookup.php b/cake/libs/generator/lookup.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/lookup.php +++ b/cake/libs/generator/lookup.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/manifest.php b/cake/libs/generator/manifest.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/manifest.php +++ b/cake/libs/generator/manifest.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/options.php b/cake/libs/generator/options.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/options.php +++ b/cake/libs/generator/options.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/scripts.php b/cake/libs/generator/scripts.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/scripts.php +++ b/cake/libs/generator/scripts.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/scripts/destroy.php b/cake/libs/generator/scripts/destroy.php index 25f447c69..e39bc3bab 100644 --- a/cake/libs/generator/scripts/destroy.php +++ b/cake/libs/generator/scripts/destroy.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.scripts * @since CakePHP v TBD diff --git a/cake/libs/generator/scripts/generate.php b/cake/libs/generator/scripts/generate.php index 25f447c69..e39bc3bab 100644 --- a/cake/libs/generator/scripts/generate.php +++ b/cake/libs/generator/scripts/generate.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.scripts * @since CakePHP v TBD diff --git a/cake/libs/generator/scripts/update.php b/cake/libs/generator/scripts/update.php index 25f447c69..e39bc3bab 100644 --- a/cake/libs/generator/scripts/update.php +++ b/cake/libs/generator/scripts/update.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator.scripts * @since CakePHP v TBD diff --git a/cake/libs/generator/simple_logger.php b/cake/libs/generator/simple_logger.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/simple_logger.php +++ b/cake/libs/generator/simple_logger.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/generator/spec.php b/cake/libs/generator/spec.php index f225d371d..b99c5a4ec 100644 --- a/cake/libs/generator/spec.php +++ b/cake/libs/generator/spec.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.generator * @since CakePHP v TBD diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index ccfcf87dc..b8237ba4d 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/legacy.php b/cake/libs/legacy.php index 7f6b40558..5177cd021 100644 --- a/cake/libs/legacy.php +++ b/cake/libs/legacy.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/log.php b/cake/libs/log.php index 699f039b3..71e4989d1 100644 --- a/cake/libs/log.php +++ b/cake/libs/log.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/model/dbo/dbo.php b/cake/libs/model/dbo/dbo.php index 7d89f22ae..61f0709aa 100644 --- a/cake/libs/model/dbo/dbo.php +++ b/cake/libs/model/dbo/dbo.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 diff --git a/cake/libs/model/dbo/dbo_adodb.php b/cake/libs/model/dbo/dbo_adodb.php index 0f7a9b285..eca5ca214 100644 --- a/cake/libs/model/dbo/dbo_adodb.php +++ b/cake/libs/model/dbo/dbo_adodb.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 diff --git a/cake/libs/model/dbo/dbo_factory.php b/cake/libs/model/dbo/dbo_factory.php index e6c213bdc..251fb3ea1 100644 --- a/cake/libs/model/dbo/dbo_factory.php +++ b/cake/libs/model/dbo/dbo_factory.php @@ -3,25 +3,22 @@ /** * Short description for file. - * + * * Long description for file * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * 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 + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.10.0.1076 @@ -44,7 +41,7 @@ config('database'); /** * DbFactory - * + * * Creates DBO-descendant objects from a given db connection configuration * * @package cake @@ -62,55 +59,53 @@ class DboFactory extends Object */ function getInstance($config = null) { - static $instance = array(); + $configName = $config; + static $instance = array(); + if ($configName == null && !empty($instance)) + { + return $instance["default"]; + } + else if ($configName == null && empty($instance)) + { + return false; + } - if (!$instance) - { - if ($config == null) - { - return false; - } + if (!key_exists($configName, $instance)) + { + $configs = get_class_vars('DATABASE_CONFIG'); + $config = $configs[$configName]; - $configs = get_class_vars('DATABASE_CONFIG'); - $config = $configs[$config]; - - - // special case for AdoDB -- driver name in the form of 'adodb-drivername' - if (preg_match('#^adodb[\-_](.*)$#i', $config['driver'], $res)) - { - uses('model'.DS.'dbo'.DS.'dbo_adodb'); - $config['driver'] = $res[1]; - - $instance[0] =& new DBO_AdoDB($config); - } - // special case for PEAR:DB -- driver name in the form of 'pear-drivername' - elseif (preg_match('#^pear[\-_](.*)$#i', $config['driver'], $res)) - { - uses('model'.DS.'dbo'.DS.'dbo_pear'); - $config['driver'] = $res[1]; - - $instance[0] =& new DBO_Pear($config); - } - // regular, Cake-native db drivers - else - { - $db_driver_class = 'DBO_'.$config['driver']; - $db_driver_fn = LIBS.strtolower('model'.DS.'dbo'.DS.$db_driver_class.'.php'); - - if (file_exists($db_driver_fn)) - { - uses(strtolower('model'.DS.'dbo'.DS.$db_driver_class)); - $instance[0] =& new $db_driver_class($config); - } - else - { - //trigger_error(ERROR_UNKNOWN_DATABASE_DRIVER, E_USER_ERROR); - return false; - } - } - } - - return $instance[0]; + // special case for AdoDB -- driver name in the form of 'adodb-drivername' + if (preg_match('#^adodb[\-_](.*)$#i', $config['driver'], $res)) + { + uses('model'.DS.'dbo'.DS.'dbo_adodb'); + $config['driver'] = $res[1]; + $instance[$configName] =& new DBO_AdoDB($config); + } + // special case for PEAR:DB -- driver name in the form of 'pear-drivername' + elseif (preg_match('#^pear[\-_](.*)$#i', $config['driver'], $res)) + { + uses('model'.DS.'dbo'.DS.'dbo_pear'); + $config['driver'] = $res[1]; + $instance[$configName] =& new DBO_Pear($config); + } + // regular, Cake-native db drivers + else + { + $db_driver_class = 'DBO_'.$config['driver']; + $db_driver_fn = LIBS.strtolower('model'.DS.'dbo'.DS.$db_driver_class.'.php'); + if (file_exists($db_driver_fn)) + { + uses(strtolower('model'.DS.'dbo'.DS.$db_driver_class)); + $instance[$configName] =& new $db_driver_class($config); + } + else + { + return false; + } + } + } + return $instance[$configName]; } /** @@ -121,13 +116,12 @@ class DboFactory extends Object */ function setConfig($config) { - $db = DboFactory::getInstance(); - if ($db->isConnected() === true) - { - $db->close(); - } - - return $this->getInstance($config); + $db = DboFactory::getInstance(); + if ($db->isConnected() === true) + { + $db->close(); + } + return $this->getInstance($config); } } diff --git a/cake/libs/model/dbo/dbo_generic.php b/cake/libs/model/dbo/dbo_generic.php index 0bb229bd7..0aec2764b 100644 --- a/cake/libs/model/dbo/dbo_generic.php +++ b/cake/libs/model/dbo/dbo_generic.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 diff --git a/cake/libs/model/dbo/dbo_mysql.php b/cake/libs/model/dbo/dbo_mysql.php index 728563271..37ec45f64 100644 --- a/cake/libs/model/dbo/dbo_mysql.php +++ b/cake/libs/model/dbo/dbo_mysql.php @@ -3,25 +3,22 @@ /** * MySQL layer for DBO - * + * * Long description for file * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * 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 + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 @@ -39,7 +36,7 @@ uses('model'.DS.'dbo'.DS.'dbo'); /** * Short description for class. - * + * * Long description for class * * @package cake @@ -55,9 +52,9 @@ class DBO_MySQL extends DBO * @param array $config Configuration array for connecting * @return boolean True if the database could be connected, else false */ - function connect ($config) + function connect ($config) { - if ($config) + if ($config) { $this->config = $config; $this->_conn = $config['connect']($config['host'],$config['login'],$config['password']); @@ -76,9 +73,9 @@ class DBO_MySQL extends DBO * * @return boolean True if the database could be disconnected, else false */ - function disconnect () + function disconnect () { - return mysql_close(); + return mysql_close($this->_conn); } /** @@ -87,9 +84,9 @@ class DBO_MySQL extends DBO * @param string $sql SQL statement * @return resource Result resource identifier */ - function execute ($sql) + function execute ($sql) { - return mysql_query($sql); + return mysql_query($sql, $this->_conn); } /** @@ -98,7 +95,7 @@ class DBO_MySQL extends DBO * @param bool $assoc Associative array only, or both? * @return array The fetched row as an array */ - function fetchRow ($assoc=false) + function fetchRow ($assoc=false) { //return mysql_fetch_array($this->_result, $assoc? MYSQL_ASSOC: MYSQL_BOTH); $this->mysqlResultSet($this->_result); @@ -112,16 +109,16 @@ class DBO_MySQL extends DBO * * @return array Array of tablenames in the database */ - function tablesList () + function tablesList () { - $result = mysql_list_tables($this->config['database']); + $result = mysql_list_tables($this->config['database'], $this->_conn); - if (!$result) + if (!$result) { trigger_error(ERROR_NO_TABLE_LIST, E_USER_NOTICE); exit; } - else + else { $tables = array(); while ($line = mysql_fetch_array($result)) @@ -168,7 +165,7 @@ class DBO_MySQL extends DBO */ function prepareValue ($data) { - return "'".mysql_real_escape_string($data)."'"; + return "'".mysql_real_escape_string($data, $this->_conn)."'"; } /** @@ -176,9 +173,9 @@ class DBO_MySQL extends DBO * * @return string Error message with error number */ - function lastError () + function lastError () { - return mysql_errno()? mysql_errno().': '.mysql_error(): null; + return mysql_errno($this->_conn)? mysql_errno($this->_conn).': '.mysql_error($this->_conn): null; } /** @@ -188,16 +185,16 @@ class DBO_MySQL extends DBO */ function lastAffected () { - return $this->_result? mysql_affected_rows(): false; + return $this->_result? mysql_affected_rows($this->_conn): false; } /** - * Returns number of rows in previous resultset. If no previous resultset exists, + * Returns number of rows in previous resultset. If no previous resultset exists, * this returns false. * * @return int Number of rows in resultset */ - function lastNumRows () + function lastNumRows () { return $this->_result? @mysql_num_rows($this->_result): false; } @@ -205,11 +202,11 @@ class DBO_MySQL extends DBO /** * Returns the ID generated from the previous INSERT operation. * - * @return int + * @return int */ - function lastInsertId () + function lastInsertId () { - return mysql_insert_id(); + return mysql_insert_id($this->_conn); } /** @@ -236,11 +233,11 @@ class DBO_MySQL extends DBO $index = 0; $num_fields = mysql_num_fields($results); $j=0; - + while ($j < $num_fields) { $column = mysql_fetch_field($results,$j); - + if(!empty($column->table)) { $this->map[$index++] = array($column->table, $column->name); @@ -252,7 +249,7 @@ class DBO_MySQL extends DBO $j++; } } - + /** * Enter description here... * @@ -277,7 +274,7 @@ class DBO_MySQL extends DBO return false; } } - + } ?> \ No newline at end of file diff --git a/cake/libs/model/dbo/dbo_pear.php b/cake/libs/model/dbo/dbo_pear.php index f81b04fed..31359dc85 100644 --- a/cake/libs/model/dbo/dbo_pear.php +++ b/cake/libs/model/dbo/dbo_pear.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.2.9 diff --git a/cake/libs/model/dbo/dbo_postgres.php b/cake/libs/model/dbo/dbo_postgres.php index cbcf62d60..8d703b857 100644 --- a/cake/libs/model/dbo/dbo_postgres.php +++ b/cake/libs/model/dbo/dbo_postgres.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.9.1.114 diff --git a/cake/libs/model/dbo/dbo_sqlite.php b/cake/libs/model/dbo/dbo_sqlite.php index b800c9700..52421f633 100644 --- a/cake/libs/model/dbo/dbo_sqlite.php +++ b/cake/libs/model/dbo/dbo_sqlite.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model.dbo * @since CakePHP v 0.9.0 diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index e914c60d9..267287033 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.model * @since CakePHP v 0.10.0.0 @@ -94,12 +92,15 @@ class Model extends Object var $table = false; /** - * Table name for this Model. + * Primary Key. + * + * If set in the model sub class this will be used. + * If not set, 'id' will be expected as the primary key * * @var string * @access public */ - var $tableId = null; + var $primaryKey = null; /** * Table metadata @@ -195,6 +196,15 @@ class Model extends Object */ var $alias = array(); +/** + * Custom database configuration name to use + * + * @var string + * @access public + */ + var $useDbConfig = 'default'; + + /** * Constructor. Binds the Model's database table to the object. * @@ -209,9 +219,9 @@ class Model extends Object $this->name = get_class($this); } - if($this->tableId === null) + if($this->primaryKey == null) { - $this->tableId = 'id'; + $this->primaryKey = 'id'; } $this->currentModel = Inflector::underscore($this->name); @@ -222,7 +232,7 @@ class Model extends Object } else { - $dboFactory = DboFactory::getInstance(); + $dboFactory = DboFactory::getInstance($this->useDbConfig); $this->db =& $dboFactory; if(empty($this->db)) { @@ -617,7 +627,7 @@ class Model extends Object { foreach ($v as $x => $y) { - if($x == $this->tableId) + if($x == $this->primaryKey) { $this->id = $y; } @@ -691,11 +701,11 @@ class Model extends Object $this->validationErrors = null; if(is_array($this->id)) { - return $this->id? $this->find("$this->name.$this->tableId = '{$this->id[0]}'", $fields): false; + return $this->id? $this->find("$this->name.$this->primaryKey = '{$this->id[0]}'", $fields): false; } else { - return $this->id? $this->find("$this->name.$this->tableId = '{$this->id}'", $fields): false; + return $this->id? $this->find("$this->name.$this->primaryKey = '{$this->id}'", $fields): false; } } @@ -789,7 +799,7 @@ class Model extends Object $values[] = (ini_get('magic_quotes_gpc') == 1) ? $this->db->prepare(stripslashes($y)) : $this->db->prepare($y); - if($x == $this->tableId && !is_numeric($y)) + if($x == $this->primaryKey && !is_numeric($y)) { $newID = $y; } @@ -823,7 +833,7 @@ class Model extends Object $sql[] = $field.'='.$value; } - $sql = "UPDATE {$this->table} SET ".join(',', $sql)." WHERE id = '{$this->id}'"; + $sql = "UPDATE {$this->table} SET ".join(',', $sql)." WHERE $this->primaryKey = '{$this->id}'"; if ($this->db->query($sql)) { @@ -836,7 +846,7 @@ class Model extends Object } else { - return $this->db->hasAny($this->table, "$this->tableId = '{$this->id}'"); + return $this->db->hasAny($this->table, "$this->primaryKey = '{$this->id}'"); } } else @@ -848,7 +858,7 @@ class Model extends Object if($this->db->query($sql)) { - $this->id = $this->db->lastInsertId($this->table, $this->tableId); + $this->id = $this->db->lastInsertId($this->table, $this->primaryKey); if(!empty($joined)) { if(!$this->id > 0 && isset($newID)) @@ -946,7 +956,7 @@ class Model extends Object { $this->id = $id; } - if ($this->id && $this->db->query("DELETE FROM {$this->table} WHERE {$this->tableId} = '{$this->id}'")) + if ($this->id && $this->db->query("DELETE FROM {$this->table} WHERE {$this->primaryKey} = '{$this->id}'")) { $this->id = false; return true; @@ -964,7 +974,7 @@ class Model extends Object */ function exists () { - return $this->id? $this->db->hasAny($this->table, "$this->tableId = '{$this->id}'"): false; + return $this->id? $this->db->hasAny($this->table, "$this->primaryKey = '{$this->id}'"): false; } /** @@ -1066,7 +1076,7 @@ class Model extends Object $oneToOneOrder = $this->{$association.'_order'}; $joins[] = "LEFT JOIN {$this->{$model}->table} AS `$alias` ON - `$alias`.{$this->{$association.'_foreignkey'}} = {$this->name}.id" + `$alias`.{$this->{$association.'_foreignkey'}} = {$this->name}.$this->primaryKey" .($oneToOneConditions? " WHERE {$oneToOneConditions}":null) .($oneToOneOrder? " ORDER BY {$oneToOneOrder}": null); } @@ -1091,7 +1101,7 @@ class Model extends Object $belongsToOtherConditions = $this->parseConditions($this->{$association.'_conditions'}); $belongsToOtherOrder = $this->{$association.'_order'}; - $joins[] = "LEFT JOIN {$this->{$model}->table} AS `$alias` ON {$this->name}.{$this->{$association.'_foreignkey'}} = `$alias`.id" + $joins[] = "LEFT JOIN {$this->{$model}->table} AS `$alias` ON {$this->name}.{$this->{$association.'_foreignkey'}} = `$alias`.{$this->{$model}->primaryKey}" .($belongsToOtherConditions? " WHERE {$belongsToOtherConditions}":null) .($belongsToOtherOrder? " ORDER BY {$belongsToOtherOrder}": null); } @@ -1167,7 +1177,7 @@ class Model extends Object $oneToManyOrder = $this->{$association.'_order'}; $tmpSQL = "SELECT {$this->{$association.'_fields'}} FROM {$this->{$model}->table} AS `{$association}` - WHERE ({$this->{$association.'_foreignkey'}}) = '{$value2['id']}'" + WHERE ({$this->{$association.'_foreignkey'}}) = '{$value2[$this->primaryKey]}'" .($oneToManyConditions? " {$oneToManyConditions}":null) .($oneToManyOrder? " ORDER BY {$oneToManyOrder}": null); } @@ -1236,7 +1246,7 @@ class Model extends Object { if( 0 == strncmp($key2, $this->{$association.'_foreignkey'}, $key2) ) { - if(!empty ($value2['id'])) + if(!empty ($value2[$this->primaryKey])) { if($this->{$association.'_findersql'}) { @@ -1250,9 +1260,9 @@ class Model extends Object $tmpSQL = "SELECT {$this->{$association.'_fields'}} FROM {$this->{$model}->table} AS `{$association}` JOIN {$this->{$association.'_jointable'}} ON {$this->{$association.'_jointable'}}. - {$this->{$association.'_foreignkey'}} = '$value2[id]' + {$this->{$association.'_foreignkey'}} = '{$value2[$this->primaryKey]}' AND {$this->{$association.'_jointable'}}. - {$this->{$association.'_associationforeignkey'}} = `{$association}` .id" + {$this->{$association.'_associationforeignkey'}} = `{$association}` .{$this->{$model}->primaryKey}" .($manyToManyConditions? " WHERE {$manyToManyConditions}":null) .($manyToManyOrder? " ORDER BY {$manyToManyOrder}": null); @@ -1515,7 +1525,7 @@ class Model extends Object // And if the display field does not exist in the table info structure, use the ID field. if( false == $this->hasField( $dispField ) ) - $dispField = $this->tableId; + $dispField = $this->primaryKey; return $dispField; } @@ -1527,7 +1537,7 @@ class Model extends Object */ function getLastInsertID() { - return $this->db->lastInsertId($this->table, $this->tableId); + return $this->db->lastInsertId($this->table, $this->primaryKey); } } diff --git a/cake/libs/neat_array.php b/cake/libs/neat_array.php index e30e27cf5..348d83537 100644 --- a/cake/libs/neat_array.php +++ b/cake/libs/neat_array.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/neat_string.php b/cake/libs/neat_string.php index ee5f17b85..f4b524759 100644 --- a/cake/libs/neat_string.php +++ b/cake/libs/neat_string.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/new_inflector.php b/cake/libs/new_inflector.php index 22b7fb8f8..74b677f86 100644 --- a/cake/libs/new_inflector.php +++ b/cake/libs/new_inflector.php @@ -9,17 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * Author(s): Larry E. Masters aka PhpNut - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v .0.10.x.x diff --git a/cake/libs/object.php b/cake/libs/object.php index 47571bcb5..ca643cf8c 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/router.php b/cake/libs/router.php index 01d1274b4..6ece2db2c 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php index 20cb60ce2..9ee34f37a 100644 --- a/cake/libs/sanitize.php +++ b/cake/libs/sanitize.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/security.php b/cake/libs/security.php index 359511609..522a37910 100644 --- a/cake/libs/security.php +++ b/cake/libs/security.php @@ -9,17 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v .0.10.0.1233 diff --git a/cake/libs/session.php b/cake/libs/session.php index d78f05876..ab056d3e9 100644 --- a/cake/libs/session.php +++ b/cake/libs/session.php @@ -9,17 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v .0.10.0.1222 diff --git a/cake/libs/validators.php b/cake/libs/validators.php index bd10ccd49..15be92c95 100644 --- a/cake/libs/validators.php +++ b/cake/libs/validators.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs * @since CakePHP v 0.2.9 diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index f2abb2646..2fa83e5c9 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view * @since CakePHP v 0.2.9 diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php index 6bc33641a..98931c481 100644 --- a/cake/libs/view/helpers/ajax.php +++ b/cake/libs/view/helpers/ajax.php @@ -9,18 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @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 14d8b74f3..6dd6e8520 100644 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -3,24 +3,22 @@ /** * Automatic generation of HTML FORMs from given data. - * + * * Used for scaffolding. * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, 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. * - * Author(s): 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 + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.10.0.1076 @@ -32,28 +30,28 @@ /** - * Tag template for a div. + * Tag template for a div. */ define('TAG_DIV', '
        %s
        '); /** - * Tag template for a div. + * Tag template for a div. */ define('TAG_P_CLASS', '

        %s

        '); /** - * Tag template for a label. + * Tag template for a label. */ define('TAG_LABEL', ''); /** - * Tag template for a fieldset. + * Tag template for a fieldset. */ define('TAG_FIELDSET', '
        %s%s'); /** * Form helper library. - * + * * Automatic generation of HTML FORMs from given data. * * @package cake @@ -69,7 +67,7 @@ class FormHelper extends Helper * Constructor which takes an instance of the HtmlHelper class. * * @param object $htmlHelper the HtmlHelper object to use as our helper. - * @return void + * @return void */ function FormHelper() { @@ -79,7 +77,7 @@ class FormHelper extends Helper * Returns a formatted error message for given FORM field, NULL if no errors. * * @param string $field If field is to be used for CRUD, this should be modelName/fieldName - * @return bool If there are errors this method returns true, else false. + * @return bool If there are errors this method returns true, else false. */ function isFieldError($field ) { @@ -102,7 +100,7 @@ class FormHelper extends Helper */ function labelTag( $tagName, $text ) { - return sprintf( TAG_LABEL, $tagName, $text ); + return sprintf( TAG_LABEL, strtolower(str_replace('/', '_',$tagName)), $text ); } /** @@ -137,11 +135,12 @@ class FormHelper extends Helper * @param bool $required True if this field is required. * @param string $errorMsg Text that will appear if an error has occurred. * @param int $size Size attribute for INPUT element - * @param array $htmlOptions + * @param array $htmlOptions * @return string The formatted INPUT element */ function generateInputDiv($tagName, $prompt, $required=false, $errorMsg=null, $size=20, $htmlOptions=null ) { + $htmlOptions['id'] = strtolower(str_replace('/', '_',$tagName));; $str = $this->Html->inputTag( $tagName, $size, $htmlOptions ); $strLabel = $this->labelTag( $tagName, $prompt ); @@ -173,13 +172,14 @@ class FormHelper extends Helper * @param bool $required True if this field is required. * @param string $errorMsg Text that will appear if an error has occurred. * @param int $size Size attribute for INPUT element - * @param array $htmlOptions + * @param array $htmlOptions * @return string The formatted INPUT element */ function generateCheckboxDiv($tagName, $prompt, $required=false, $errorMsg=null, $htmlOptions=null ) { - $htmlOptions['class'] = "inputCheckbox"; - $str = $this->Html->checkbox( $tagName, null, $htmlOptions ); + $htmlOptions['class'] = "inputCheckbox"; + $htmlOptions['id'] = strtolower(str_replace('/', '_',$tagName));; + $str = $this->Html->checkbox( $tagName, null, $htmlOptions ); $strLabel = $this->labelTag( $tagName, $prompt ); $divClass = "optional"; @@ -209,12 +209,13 @@ class FormHelper extends Helper * @param bool $required True if this field is required. * @param string $errorMsg Text that will appear if an error has occurred. * @param int $size Size attribute for INPUT element - * @param array $htmlOptions + * @param array $htmlOptions * @return string The formatted INPUT element - */ + */ function generateDate($tagName, $prompt, $required=false, $errorMsg=null, $size=20, $htmlOptions=null ) { - $str = $this->Html->dateTimeOptionTag( $tagName, 'MDY' , 'NONE' ); + $htmlOptions['id'] = strtolower(str_replace('/', '_',$tagName));; + $str = $this->Html->dateTimeOptionTag( $tagName, 'MDY' , 'NONE', '', $htmlOptions); $strLabel = $this->labelTag( $tagName, $prompt ); $divClass = "optional"; @@ -236,7 +237,7 @@ class FormHelper extends Helper return $this->divTag("date", $requiredDiv); } - + /** * Returns a formatted datetime option element for HTML FORMs. * @@ -245,12 +246,13 @@ class FormHelper extends Helper * @param bool $required True if this field is required. * @param string $errorMsg Text that will appear if an error has occurred. * @param int $size Size attribute for INPUT element - * @param array $htmlOptions + * @param array $htmlOptions * @return string The formatted datetime option element - */ + */ function generateDateTime($tagName, $prompt, $required=false, $errorMsg=null, $size=20, $htmlOptions=null ) { - $str = $this->Html->dateTimeOptionTag( $tagName, 'MDY' , '12' ); + $htmlOptions['id'] = strtolower(str_replace('/', '_',$tagName));; + $str = $this->Html->dateTimeOptionTag( $tagName, 'MDY' , '12', '', $htmlOptions); $strLabel = $this->labelTag( $tagName, $prompt ); $divClass = "optional"; @@ -272,7 +274,7 @@ class FormHelper extends Helper return $this->divTag("date", $requiredDiv); } - + /** * Returns a formatted TEXTAREA inside a DIV for use with HTML forms. * @@ -287,6 +289,7 @@ class FormHelper extends Helper */ function generateAreaDiv($tagName, $prompt, $required=false, $errorMsg=null, $cols=60, $rows=10, $htmlOptions=null ) { + $htmlOptions['id'] = strtolower(str_replace('/', '_',$tagName));; $str = $this->Html->areaTag( $tagName, $cols, $rows, $htmlOptions ); $strLabel = $this->labelTag( $tagName, $prompt ); @@ -308,7 +311,7 @@ class FormHelper extends Helper return $this->divTag( $divClass, $divTagInside ); } - + /** * Returns a formatted SELECT tag for HTML FORMs. * @@ -319,11 +322,12 @@ class FormHelper extends Helper * @param array $selectAttr Array of HTML attributes for the SELECT element * @param array $optionAttr Array of HTML attributes for the OPTION elements * @param bool $required True if this field is required - * @param string $errorMsg Text that will appear if an error has occurred + * @param string $errorMsg Text that will appear if an error has occurred * @return string The formatted INPUT element */ function generateSelectDiv($tagName, $prompt, $options, $selected=null, $selectAttr=null, $optionAttr=null, $required=false, $errorMsg=null) { + $selectAttr['id'] = strtolower(str_replace('/', '_',$tagName));; $str = $this->Html->selectTag( $tagName, $options, $selected, $selectAttr, $optionAttr ); $strLabel = $this->labelTag( $tagName, $prompt ); @@ -344,8 +348,8 @@ class FormHelper extends Helper return $this->divTag( $divClass, $divTagInside ); - } - + } + /** * Returns a formatted submit widget for HTML FORMs. * @@ -414,7 +418,7 @@ class FormHelper extends Helper $field['selectAttr'] = null; if( !isset( $field['optionsAttr'] ) ) $field['optionsAttr'] = null; - + if( $readOnly ) $field['selectAttr']['DISABLED'] = true; @@ -432,7 +436,7 @@ class FormHelper extends Helper break; case "fieldset"; $strFieldsetFields = $this->generateFields( $field['fields'] ); - + $strFieldSet = sprintf( '
        %s diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index d780f0312..918756f09 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -7,18 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.9.1 diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php index 93f408e3f..6943ebd03 100644 --- a/cake/libs/view/helpers/javascript.php +++ b/cake/libs/view/helpers/javascript.php @@ -7,19 +7,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php index 8ab2ca389..c7dc1f964 100644 --- a/cake/libs/view/helpers/number.php +++ b/cake/libs/view/helpers/number.php @@ -9,20 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. - * - * @filesource - * @author CakePHP Authors/Developers - * @author Christian Gillen aka kodos - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php index bc742c0ab..617d45439 100644 --- a/cake/libs/view/helpers/text.php +++ b/cake/libs/view/helpers/text.php @@ -3,26 +3,22 @@ /** * Text Helper - * + * * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links... * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. - * - * @filesource - * @author CakePHP Authors/Developers - * @author Christian Gillen aka kodos - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.10.0.1076 @@ -39,7 +35,7 @@ uses('flay', DS.'view'.DS.'helpers'.DS.'html'); /** * Text helper library. - * + * * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links... * * @package cake @@ -85,7 +81,7 @@ class TextHelper extends Helper /** * Strips given text of all links ( - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.helpers * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/error404.thtml b/cake/libs/view/templates/errors/error404.thtml index 87ae00ee1..0073884df 100644 --- a/cake/libs/view/templates/errors/error404.thtml +++ b/cake/libs/view/templates/errors/error404.thtml @@ -1,2 +1,32 @@ + + * Copyright (c) 2005, 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. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @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 + */ +?>

        diff --git a/cake/libs/view/templates/errors/missing_action.thtml b/cake/libs/view/templates/errors/missing_action.thtml index a9fba59ad..213dfec80 100644 --- a/cake/libs/view/templates/errors/missing_action.thtml +++ b/cake/libs/view/templates/errors/missing_action.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/missing_controller.thtml b/cake/libs/view/templates/errors/missing_controller.thtml index f81409449..89189b9bd 100644 --- a/cake/libs/view/templates/errors/missing_controller.thtml +++ b/cake/libs/view/templates/errors/missing_controller.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/missing_database.thtml b/cake/libs/view/templates/errors/missing_database.thtml index c493d0725..0842be914 100644 --- a/cake/libs/view/templates/errors/missing_database.thtml +++ b/cake/libs/view/templates/errors/missing_database.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/missing_helper_class.thtml b/cake/libs/view/templates/errors/missing_helper_class.thtml index 7314891c3..c59895bfd 100644 --- a/cake/libs/view/templates/errors/missing_helper_class.thtml +++ b/cake/libs/view/templates/errors/missing_helper_class.thtml @@ -1,78 +1,75 @@ - - * 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; - $missingFile = $this->controller->missingHelperFile; - -?> -

        Missing 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 view helper classes. -

        - -

        -Fatal: Create the Class: -

        -

        -<?php\n\nclass " . $missingClass ." extends Helper {\n - // Your helper functions here - function myHelperFunction () - { - } -}\n?>"; ?> -in file : -

        - -

        -Error: Unable to load helper class in -View::_loadHelpers -

        - -1):?> -

        Controller dump:

        -
        -db);
-print_r($this); 
-?>
-
        + + * Copyright (c) 2005, 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. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @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; + $missingFile = $this->controller->missingHelperFile; + +?> +

        Missing 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 view helper classes. +

        + +

        +Fatal: Create the Class: +

        +

        +<?php\n\nclass " . $missingClass ." extends Helper {\n + // Your helper functions here + function myHelperFunction () + { + } +}\n?>"; ?> +in file : +

        + +

        +Error: Unable to load helper class in +View::_loadHelpers +

        + +1):?> +

        Controller dump:

        +
        +db);
+print_r($this);
+?>
+
        \ No newline at end of file diff --git a/cake/libs/view/templates/errors/missing_helper_file.thtml b/cake/libs/view/templates/errors/missing_helper_file.thtml index 044f43f3e..8a41bebd5 100644 --- a/cake/libs/view/templates/errors/missing_helper_file.thtml +++ b/cake/libs/view/templates/errors/missing_helper_file.thtml @@ -1,78 +1,75 @@ - - * 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; - $missingFile = $this->controller->missingHelperFile; - -?> -

        Missing 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 view helper files. -

        - -

        -Fatal: Create the Class: -

        -

        -<?php\n\nclass " . $missingClass ." extends Helper {\n - // Your helper functions here - function myHelperFunction () - { - } -}\n?>"; ?> -in file : -

        - -

        -Error: Unable to load helper file in -View::_loadHelpers -

        - -1):?> -

        Controller dump:

        -
        -db);
-print_r($this); 
-?>
-
        + + * Copyright (c) 2005, 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. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @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; + $missingFile = $this->controller->missingHelperFile; + +?> +

        Missing 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 view helper files. +

        + +

        +Fatal: Create the Class: +

        +

        +<?php\n\nclass " . $missingClass ." extends Helper {\n + // Your helper functions here + function myHelperFunction () + { + } +}\n?>"; ?> +in file : +

        + +

        +Error: Unable to load helper file in +View::_loadHelpers +

        + +1):?> +

        Controller dump:

        +
        +db);
+print_r($this);
+?>
+
        \ No newline at end of file diff --git a/cake/libs/view/templates/errors/missing_scaffolddb.thtml b/cake/libs/view/templates/errors/missing_scaffolddb.thtml index c34be52f7..18d4eb7d3 100644 --- a/cake/libs/view/templates/errors/missing_scaffolddb.thtml +++ b/cake/libs/view/templates/errors/missing_scaffolddb.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/missing_table.thtml b/cake/libs/view/templates/errors/missing_table.thtml index 358a11f68..36d8fda2f 100644 --- a/cake/libs/view/templates/errors/missing_table.thtml +++ b/cake/libs/view/templates/errors/missing_table.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/missing_view.thtml b/cake/libs/view/templates/errors/missing_view.thtml index e2971c8c9..993a2230e 100644 --- a/cake/libs/view/templates/errors/missing_view.thtml +++ b/cake/libs/view/templates/errors/missing_view.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/errors/private_action.thtml b/cake/libs/view/templates/errors/private_action.thtml index 8bd511940..db0fef0d3 100644 --- a/cake/libs/view/templates/errors/private_action.thtml +++ b/cake/libs/view/templates/errors/private_action.thtml @@ -1,5 +1,5 @@ - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.errors * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/layouts/ajax.thtml b/cake/libs/view/templates/layouts/ajax.thtml index a51c7fce8..c4a502d7f 100644 --- a/cake/libs/view/templates/layouts/ajax.thtml +++ b/cake/libs/view/templates/layouts/ajax.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.layouts * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml index 1d59e05e6..f5481679a 100644 --- a/cake/libs/view/templates/layouts/default.thtml +++ b/cake/libs/view/templates/layouts/default.thtml @@ -1,65 +1,76 @@ + + * Copyright (c) 2005, 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. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @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 : A Rapid Development Framework :: <?php echo $title_for_layout?> - +'CakePHP : A Rapid Development Framework :: <?php echo $title_for_layout?> + charset('UTF-8')?> css('cake.default')?> -css('cake.scaffold')?> -css('cake.forms')?> + -
        - - - -
        - - controller->Session->flash(); ?> - -
        - - + - - - + \ 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 7aed52ee2..98c62e6ea 100644 --- a/cake/libs/view/templates/layouts/flash.thtml +++ b/cake/libs/view/templates/layouts/flash.thtml @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.layouts * @since CakePHP v 0.10.0.1076 diff --git a/cake/libs/view/templates/pages/home.thtml b/cake/libs/view/templates/pages/home.thtml index ba4a1c3f6..1290991bc 100644 --- a/cake/libs/view/templates/pages/home.thtml +++ b/cake/libs/view/templates/pages/home.thtml @@ -3,25 +3,22 @@ /** * - * + * * * * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. * - * 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 + * @filesource + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view.templates.pages * @since CakePHP v 0.10.0.1076 @@ -31,41 +28,53 @@ * @license http://www.opensource.org/licenses/mit-license.php The MIT License */ ?> -
        -

        Cake Pre Beta mmmmm good

        -

        -The Pre Beta release is exciting. We changed quite a few things, but hope you agree with -our efforts to make the code easier to read and handle. -It all comes back to our desire to make the best RAD framework available. -

        -

        See CakePHP.org for major changes in this release

        -

        If you plan to upgrade from an older version, you may also want to read the changelog

        -

        - -

        Your database configuration file is

        +

        Your database configuration file is

        -

        Cake connected ? "is able to" : "is not able to" ?> connect to the database.

        +

        Cakeconnected ? ' is able to' : ' is not able to'; ' connect to the database'; ?>.

        +
        +

        Take a bite out of CakePHP Beta

        +

        +More content will be added... +

        +

        If you plan to upgrade from an older version, you may also want to read the changelog

        +

        Editing this Page

        -To change the content of this page, create /app/views/pages/home.thtml. -To change it's layout, create /app/views/layouts/default.thtml. -see the wiki for more info -You can also add some CSS styles for your pages at /webroot/css/. +To change the content of this page, create: /app/views/pages/home.thtml.
        +To change its layout, create: /app/views/layouts/default.thtml.
        +See the wiki for more info
        +You can also add some CSS styles for your pages at: app/webroot/css/.

        More about Cake

        -Cake is a rapid development framework for PHP which uses commonly known design patterns like -ActiveRecord, Association Data Mapping, Front Controller and MVC. -Our primary goal is to provide a structured framework that enables PHP users at all levels +CakePHP is a rapid development framework for PHP which uses commonly known design patterns like +Active Record, Association Data Mapping, Front Controller and MVC. +

        +

        +Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.

        - -

        -#cakephp at irc.freenode.net -· -Cake PHP Google Group -· -Cake TRAC (Wiki, SVN repository, etc.) -

        \ No newline at end of file + \ No newline at end of file diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php index b0e801509..cd7fd0936 100644 --- a/cake/libs/view/view.php +++ b/cake/libs/view/view.php @@ -8,18 +8,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The MIT License - * Redistributions of files must retain the above copyright notice. + * Copyright (c) 2005, 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 - * @author CakePHP Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Authors/Developers - * @link https://trac.cakephp.org/wiki/Authors Authors/Developers + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.libs.view * @since CakePHP v 0.10.0.1076 diff --git a/cake/scripts/acl.php b/cake/scripts/acl.php index 0e0003358..ced2fd255 100644 --- a/cake/scripts/acl.php +++ b/cake/scripts/acl.php @@ -1,12 +1,56 @@ #!/usr/bin/php -q + * Copyright (c) 2005, 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. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project + * @package cake + * @subpackage cake.cake.libs.controller.components.dbacl.models + * @since CakePHP v 0.10.0.1232 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/mit-license.php The MIT License + */ ini_set('display_errors', '1'); ini_set('error_reporting', '7'); +/** + * Enter description here... + * + */ define ('DS', DIRECTORY_SEPARATOR); +/** + * Enter description here... + * + */ define ('ROOT', dirname(dirname(dirname(__FILE__))).DS); +/** + * Enter description here... + * + */ define ('APP_DIR', 'app'); +/** + * Enter description here... + * + */ +define ('DEBUG', 1); require_once (ROOT.'cake'.DS.'config'.DS.'paths.php'); require_once (CAKE.'basics.php'); @@ -30,37 +74,80 @@ $args = $_SERVER['argv']; $aclCLI = new AclCLI ($command, $args); class AclCLI { - + + /** + * Enter description here... + * + * @var unknown_type + */ var $stdin; + /** + * Enter description here... + * + * @var unknown_type + */ var $stdout; + /** + * Enter description here... + * + * @var unknown_type + */ var $stderr; - + + /** + * Enter description here... + * + * @var unknown_type + */ var $acl; + /** + * Enter description here... + * + * @var unknown_type + */ var $controller; - + + /** + * Enter description here... + * + * @var unknown_type + */ var $args; - - function AclCLI($command, $args) + + /** + * Enter description here... + * + * @param unknown_type $command + * @param unknown_type $args + * @return AclCLI + */ + function AclCLI($command, $args) { $this->__construct($command, $args); } - - function __construct ($command, $args) + + /** + * Enter description here... + * + * @param unknown_type $command + * @param unknown_type $args + */ + function __construct ($command, $args) { $acl = new AclComponent(); - $this->acl = $acl->getACL(); - + $this->acl = $acl->getACL(); + $this->args = $args; - + $this->controller =& new Controller(); $this->controller->constructClasses(); $this->stdin = fopen('php://stdin', 'r'); $this->stdout = fopen('php://stdout', 'w'); $this->stderr = fopen('php://stderr', 'w'); - + //Check to see if DB ACL is enabled - if (ACL_CLASSNAME != 'DB_ACL') + if (ACL_CLASSNAME != 'DB_ACL') { $out = "--------------------------------------------------\n"; $out .= "Error: Your current Cake configuration is set to \n"; @@ -70,145 +157,266 @@ class AclCLI { $out .= "--------------------------------------------------\n"; $out .= "Current ACL Classname: " . ACL_CLASSNAME . "\n"; $out .= "--------------------------------------------------\n"; - + fwrite($this->stderr, $out); exit(); } - switch ($command) + switch ($command) { case 'create': - $this->create(); - break; + $this->create(); + break; case 'delete': - $this->delete(); + $this->delete(); break; case 'setParent': - $this->setParent(); + $this->setParent(); break; case 'getPath': - $this->getPath(); + $this->getPath(); break; case 'grant': - $this->grant(); + $this->grant(); break; case 'deny': - $this->deny(); + $this->deny(); break; case 'inherit': - $this->inherit(); + $this->inherit(); break; case 'view': $this->view(); break; + case 'initdb': + $this->initdb(); + break; case 'help': $this->help(); break; default: fwrite($this->stderr, "Unknown ACL command '$command'.\nFor usage, try 'php acl.php help'.\n\n"); } - + } - function create() + /** + * Enter description here... + * + */ + function create() { $this->checkArgNumber(4, 'create'); $this->checkNodeType(); extract($this->__dataVars()); $node = &new $class; - $parent = $this->nodeExists($this->args[0], $this->args[2]); - - if (!$parent) + + $parent = intval($this->args[2]); + + if(!$node->create(intval($this->args[1]), $parent, $this->args[3])) { - fwrite($this->stdout, "Warning: Parent not found. Creating this object with the root node as parent.\n"); - $parent = $node->find(null, "MAX(rght)"); + $this->displayError("Parent Node Not Found", "There was an error creating the Aro, probably couldn't find the parent node.\n If you wish to create a new root node, specify the parent ID as '0'."); } - - $node->create($this->args[1], $parent[$data_name]['id'], $this->args[3]); - + fwrite($this->stdout, "New $class '".$this->args[3]."' created.\n\n"); } - - function delete() + + /** + * Enter description here... + * + */ + function delete() { $this->checkArgNumber(2, 'delete'); $this->checkNodeType(); extract($this->__dataVars()); $node = &new $class; - + //What about children? //$node->del($this->args[1]); //fwrite($this->stdout, "$class deleted.\n\n"); } - - function setParent() - { + + /** + * Enter description here... + * + */ + function setParent() + { $this->checkArgNumber(3, 'setParent'); $this->checkNodeType(); extract($this->__dataVars()); $node = &new $class; - $parent = $this->nodeExists($this->args[0], $this->args[2]); - - if (!$parent) + + if (!$node->setParent(intval($this->args[2]), intval($this->args[1]))) { - fwrite($this->stdout, "Warning: Parent not found. Setting this object with the root node as parent.\n"); - $parent = $node->find(null, "MAX(rght)"); + fwrite($this->stdout, "Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.\n"); + } + else + { + fwrite($this->stdout, "Node parent set to ".$this->args[2]."\n\n"); } - - $node = &new $class; - - $node->setParent($parent[$data_name]['id'], $this->args[1]); - fwrite($this->stdout, "Node parent set to ".$this->args[2]."\n\n"); } - - function getPath() + + /** + * Enter description here... + * + */ + function getPath() { $this->checkArgNumber(2, 'getPath'); $this->checkNodeType(); extract($this->__dataVars()); - + $suppliedNode = $this->nodeExists($this->args[0], $this->args[1]); - + if (!$suppliedNode) { $this->displayError("Supplied Node '".$args[1]."' not found. No tree returned."); } - + $node = &new $class; - - fwrite($this->stdout, print_r($node->getPath($this->args[1]))); + + $nodes = $node->getPath(intval($this->args[1])); + + for ($i = 0; $i < count($nodes); $i++) + { + fwrite($this->stdout, str_repeat(' ', $i) . "[" . $nodes[$i][$class]['id'] . "]" . $nodes[$i][$class]['alias'] . "\n"); + } } - - function grant() + + /** + * Enter description here... + * + */ + function grant() { $this->checkArgNumber(3, 'grant'); //add existence checks for nodes involved - - - $this->acl->allow($this->args[0], $this->args[1], $this->args[2]); - fwrite($this->stdout, "Permission granted..."); + + + $this->acl->allow(intval($this->args[0]), intval($this->args[1]), $this->args[2]); + fwrite($this->stdout, "Permission granted.\n"); } - - function deny() + + /** + * Enter description here... + * + */ + function deny() { $this->checkArgNumber(3, 'deny'); //add existence checks for nodes involved - - $this->acl->deny($this->args[0], $this->args[1], $this->args[2]); - fwrite($this->stdout, "Permission denied..."); + + $this->acl->deny(intval($this->args[0]), intval($this->args[1]), $this->args[2]); + fwrite($this->stdout, "Requested permission successfully denied.\n"); } - + + /** + * Enter description here... + * + */ function inherit() {} - - function view() {} - - function help() + + /** + * Enter description here... + * + */ + function view() { - $out = "Usage: php acl.php ...\n"; + $this->checkArgNumber(1, 'view'); + $this->checkNodeType(); + extract($this->__dataVars()); + + $node = &new $class; + $nodes = $node->findAll(null, null, 'lft ASC'); + + $right = array(); + + fwrite($this->stdout, $class . " tree:\n"); + fwrite($this->stdout, "------------------------------------------------\n"); + + for($i = 0; $i < count($nodes); $i++) + { + if (count($right) > 0) + { + while ($right[count($right)-1] < $nodes[$i][$class]['rght']) + { + if ($right[count($right)-1]) + { + array_pop($right); + } + else + { + break; + } + + } + } + + fwrite($this->stdout, str_repeat(' ',count($right)) . "[" . $nodes[$i][$class]['id'] . "]" . $nodes[$i][$class]['alias']."\n"); + $right[] = $nodes[$i][$class]['rght']; + } + + fwrite($this->stdout, "------------------------------------------------\n"); + } + + /** + * Enter description here... + * + */ + function initdb() + { + fwrite($this->stdout, "Initializing Database...\n"); + fwrite($this->stdout, "Creating access control objects table (acos)...\n"); + $sql = " CREATE TABLE `acos` ( + `id` int(11) NOT NULL auto_increment, + `object_id` int(11) default NULL, + `alias` varchar(255) NOT NULL default '', + `lft` int(11) default NULL, + `rght` int(11) default NULL, + PRIMARY KEY (`id`) + );"; + $this->controller->db->query($sql); + + fwrite($this->stdout, "Creating access request objects table (acos)...\n"); + $sql2 = "CREATE TABLE `aros` ( + `id` int(11) NOT NULL auto_increment, + `user_id` int(11) default NULL, + `alias` varchar(255) NOT NULL default '', + `lft` int(11) default NULL, + `rght` int(11) default NULL, + PRIMARY KEY (`id`) + );"; + $this->controller->db->query($sql2); + + fwrite($this->stdout, "Creating relationships table (aros_acos)...\n"); + $sql3 = "CREATE TABLE `aros_acos` ( + `id` int(11) NOT NULL auto_increment, + `aro_id` int(11) default NULL, + `aco_id` int(11) default NULL, + `_create` int(1) NOT NULL default '0', + `_read` int(1) NOT NULL default '0', + `_update` int(1) NOT NULL default '0', + `_delete` int(11) NOT NULL default '0', + PRIMARY KEY (`id`) + );"; + $this->controller->db->query($sql3); + + fwrite($this->stdout, "\nDone.\n"); + } + + /** + * Enter description here... + * + */ + function help() + { + $out = "Usage: php acl.php ...\n"; $out .= "-----------------------------------------------\n"; $out .= "Commands:\n"; $out .= "\n"; - + $out .= "\tcreate aro|aco \n"; $out .= "\t\tCreates a new ACL object under the parent specified by parent_id (see\n"; $out .= "\t\t'view'). The link_id allows you to link a current user object to Cake's\n"; @@ -218,60 +426,71 @@ class AclCLI { $out .= "\t\tin your users table, with an internal alias 'John'."; $out .= "\n"; $out .= "\n"; - + $out .= "\tdelete aro|aco \n"; $out .= "\t\tDeletes the ACL object with the specified ID (see 'view').\n"; $out .= "\n"; $out .= "\n"; - + $out .= "\tsetParent aro|aco \n"; $out .= "\t\tUsed to set the parent of the ACL object specified by to the ID\n"; $out .= "\t\tspecified by .\n"; $out .= "\n"; $out .= "\n"; - + $out .= "\tgetPath aro|aco \n"; $out .= "\t\tReturns the path to the ACL object specified by . This command is\n"; $out .= "\t\tis useful in determining the inhertiance of permissions for a certain\n"; $out .= "\t\tobject in the tree.\n"; $out .= "\n"; $out .= "\n"; - + $out .= "\tgrant \n"; $out .= "\t\tUse this command to grant ACL permissions. Once executed, the ARO\n"; $out .= "\t\tspecified (and its children, if any) will have ALLOW access to the\n"; $out .= "\t\tspecified ACO action (and the ACO's children, if any).\n"; $out .= "\n"; $out .= "\n"; - + $out .= "\tdeny \n"; $out .= "\t\tUse this command to deny ACL permissions. Once executed, the ARO\n"; $out .= "\t\tspecified (and its children, if any) will have DENY access to the\n"; $out .= "\t\tspecified ACO action (and the ACO's children, if any).\n"; $out .= "\n"; $out .= "\n"; - + $out .= "\tinherit \n"; $out .= "\t\tUse this command to force a child ARO object to inherit its\n"; $out .= "\t\tpermissions settings from its parent.\n"; $out .= "\n"; $out .= "\n"; - + $out .= "\tview aro|aco [id]\n"; $out .= "\t\tThe view command will return the ARO or ACO tree. The optional\n"; $out .= "\t\tid/alias parameter allows you to return only a portion of the requested\n"; $out .= "\t\ttree.\n"; $out .= "\n"; $out .= "\n"; - + + $out .= "\tinitdb\n"; + $out .= "\t\tUse this command to create the database tables needed to use DB ACL.\n"; + $out .= "\n"; + $out .= "\n"; + $out .= "\thelp\n"; $out .= "\t\tDisplays this help message.\n"; $out .= "\n"; $out .= "\n"; - + fwrite($this->stdout, $out); } - + + /** + * Enter description here... + * + * @param unknown_type $title + * @param unknown_type $msg + */ function displayError($title, $msg) { $out = "\n"; @@ -281,7 +500,13 @@ class AclCLI { fwrite($this->stdout, $out); exit(); } - + + /** + * Enter description here... + * + * @param unknown_type $expectedNum + * @param unknown_type $command + */ function checkArgNumber($expectedNum, $command) { if (count($this->args) != $expectedNum) @@ -289,7 +514,11 @@ class AclCLI { $this->displayError('Wrong number of parameters: '.count($this->args), 'Please type \'php acl.php help\' for help on usage of the '.$command.' command.'); } } - + + /** + * Enter description here... + * + */ function checkNodeType() { if ($this->args[0] != 'aco' && $this->args[0] != 'aro') @@ -297,32 +526,45 @@ class AclCLI { $this->displayError("Missing/Unknown node type: '".$this->args[0]."'", 'Please specify which ACL object type you wish to create.'); } } - + + /** + * Enter description here... + * + * @param unknown_type $type + * @param unknown_type $id + * @return unknown + */ function nodeExists($type, $id) { - fwrite($this->stdout, "Check to see if $type with ID = $id exists...\n"); + //fwrite($this->stdout, "Check to see if $type with ID = $id exists...\n"); extract($this->__dataVars($type)); $node = &new $class; - + $possibility = $node->find('id = ' . $id); - - if (empty($possibility[$data_name]['id'])) + + if (empty($possibility[$class]['id'])) { return false; } - else + else { return $possibility; } } - + + /** + * Enter description here... + * + * @param unknown_type $type + * @return unknown + */ function __dataVars($type = null) { if ($type == null) { $type = $this->args[0]; } - + $vars = array(); $class = ucwords($type); $vars['secondary_id'] = ($class == 'aro' ? 'user_id' : 'object_id'); diff --git a/cake/scripts/bake.php b/cake/scripts/bake.php index 18a33a3e3..2580d0428 100644 --- a/cake/scripts/bake.php +++ b/cake/scripts/bake.php @@ -10,19 +10,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.scripts * @since CakePHP v 0.2.9 diff --git a/cake/scripts/test.php b/cake/scripts/test.php index 3b558f775..0ee37a403 100644 --- a/cake/scripts/test.php +++ b/cake/scripts/test.php @@ -9,19 +9,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @subpackage cake.cake.scripts * @since CakePHP v 0.2.9 diff --git a/index.php b/index.php index 68008c797..c477fdd08 100644 --- a/index.php +++ b/index.php @@ -11,19 +11,16 @@ * PHP versions 4 and 5 * * CakePHP : Rapid Development Framework - * Copyright (c) 2005, CakePHP Authors/Developers + * Copyright (c) 2005, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 * - * 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. + * 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 + * @copyright Copyright (c) 2005, Cake Software Foundation, Inc. + * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project * @package cake * @since CakePHP v 0.2.9 * @version $Revision$ diff --git a/tmp/logs/put_logs_here b/tmp/logs/put_logs_here deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendors/put_vendor_libraries_here b/vendors/put_vendor_libraries_here deleted file mode 100644 index e69de29bb..000000000