Permalink
Browse files

Merging fixes and enhancements into trunk

Revision: [2025]
A little more work on plugin to set some default routing.

Revision: [2024]
Changed DboSource::field() so the name() is not called for some field variables.

Revision: [2023]
Changes made in [2022] should only check if the $conditions is not empty.

Revision: [2022]
Changed DboSource::conditions() so it will add the "ticks" needed around the Model.field names.
The Model.field name conventions must be used for this to work.

Revision: [2021]
Adding fix for Ticket #405

Revision: [2020]
Added fix for Ticket #403

Revision: [2019]
Added patch from Ticket #404.
Fixing formatting of files.

Revision: [2018]
Fixing formatting of files 

Revision: [2017]
Fixed bad search and replace

Revision: [2016]
Fixing formatting of files 

Revision: [2015]
Replaced all 3 space indents with 4 space indents

Revision: [2014]
Updating variables to use the naming proper conventions

Revision: [2013]
Added patch from Ticket #406

Revision: [2012]
Adding fix for Ticket #407.
Fix variables that where not formatted per the coding conventions

Revision: [2011]
Adding patch from Ticket #401

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2026 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent 9a8d5c1 commit a75e08976f2af9724210cd2f48ea2988127539a1 @phpnut phpnut committed Feb 18, 2006
Showing with 3,231 additions and 3,069 deletions.
  1. +2 −2 .htaccess
  2. +1 −1 VERSION.txt
  3. +2 −2 app/.htaccess
  4. +7 −7 app/config/core.php
  5. +6 −6 app/config/database.php.default
  6. +6 −6 app/config/routes.php
  7. +4 −4 app/config/sql/sessions.sql
  8. +31 −31 app/webroot/css.php
  9. +4 −4 app/webroot/index.php
  10. +4 −4 app/webroot/js/vendors.php
  11. +50 −40 cake/basics.php
  12. +3 −3 cake/bootstrap.php
  13. +2 −2 cake/config/paths.php
  14. +134 −127 cake/dispatcher.php
  15. +2 −2 cake/docs/CHANGELOG.txt
  16. +2 −2 cake/docs/CREDITS.txt
  17. +2 −2 cake/docs/GOTCHAS.txt
  18. +2 −2 cake/docs/README.txt
  19. +51 −51 cake/libs/bake.php
  20. +62 −62 cake/libs/cache.php
  21. +6 −6 cake/libs/cake_log.php
  22. +19 −19 cake/libs/class_registry.php
  23. +35 −35 cake/libs/controller/components/acl.php
  24. +5 −5 cake/libs/controller/components/acl_base.php
  25. +49 −49 cake/libs/controller/components/dbacl/db_acl.php
  26. +36 −36 cake/libs/controller/components/dbacl/models/aclnode.php
  27. +2 −2 cake/libs/controller/components/dbacl/models/aco.php
  28. +1 −1 cake/libs/controller/components/dbacl/models/acoaction.php
  29. +3 −3 cake/libs/controller/components/dbacl/models/aros_aco.php
  30. +73 −73 cake/libs/controller/components/iniacl/ini_acl.php
  31. +1 −1 cake/libs/controller/components/request_handler.php
  32. +7 −10 cake/libs/controller/controller.php
  33. +18 −18 cake/libs/controller/pages_controller.php
  34. +47 −47 cake/libs/controller/scaffold.php
  35. +66 −66 cake/libs/file.php
  36. +91 −91 cake/libs/flay.php
  37. +167 −167 cake/libs/folder.php
  38. +140 −140 cake/libs/inflector.php
  39. +1 −1 cake/libs/legacy.php
  40. +4 −4 cake/libs/model/connection_manager.php
  41. +31 −31 cake/libs/model/datasources/datasource.php
  42. +80 −64 cake/libs/model/datasources/dbo_source.php
  43. +43 −43 cake/libs/model/dbo/dbo_adodb.php
  44. +73 −73 cake/libs/model/dbo/dbo_dbo.php
  45. +37 −37 cake/libs/model/dbo/dbo_generic.php
  46. +14 −9 cake/libs/model/dbo/dbo_mysql.php
  47. +91 −91 cake/libs/model/dbo/dbo_pear.php
  48. +259 −131 cake/libs/model/dbo/dbo_postgres.php
  49. +37 −37 cake/libs/model/dbo/dbo_sqlite.php
  50. +174 −174 cake/libs/model/model_php4.php
  51. +173 −173 cake/libs/model/model_php5.php
  52. +53 −53 cake/libs/neat_array.php
  53. +4 −4 cake/libs/neat_string.php
  54. +33 −33 cake/libs/object.php
  55. +52 −52 cake/libs/router.php
  56. +37 −37 cake/libs/sanitize.php
  57. +1 −1 cake/libs/security.php
  58. +3 −3 cake/libs/session.php
  59. +8 −8 cake/libs/validators.php
  60. +23 −23 cake/libs/view/helper.php
  61. +175 −175 cake/libs/view/helpers/ajax.php
  62. +28 −28 cake/libs/view/helpers/form.php
  63. +263 −264 cake/libs/view/helpers/html.php
  64. +51 −51 cake/libs/view/helpers/javascript.php
  65. +9 −9 cake/libs/view/helpers/number.php
  66. +10 −10 cake/libs/view/helpers/text.php
  67. +16 −16 cake/libs/view/helpers/time.php
  68. +2 −2 cake/libs/view/templates/layouts/default.thtml
  69. +6 −6 cake/libs/view/templates/layouts/flash.thtml
  70. +2 −2 cake/libs/view/templates/scaffolds/show.thtml
  71. +110 −110 cake/libs/view/view.php
  72. +181 −181 cake/scripts/acl.php
  73. +2 −2 cake/scripts/bake.php
  74. +2 −2 index.php
View
@@ -1,5 +1,5 @@
<IfModule mod_rewrite.c>
RewriteEngine on
- RewriteRule ^$ app/webroot/ [L]
- RewriteRule (.*) app/webroot/$1 [L]
+ RewriteRule ^$ app/webroot/ [L]
+ RewriteRule (.*) app/webroot/$1 [L]
</IfModule>
View
@@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
-0.10.8.2010
+0.10.8.2026
View
@@ -1,5 +1,5 @@
<IfModule mod_rewrite.c>
RewriteEngine on
- RewriteRule ^$ webroot/ [L]
- RewriteRule (.*) webroot/$1 [L]
+ RewriteRule ^$ webroot/ [L]
+ RewriteRule (.*) webroot/$1 [L]
</IfModule>
View
@@ -54,14 +54,14 @@
*/
define('DEBUG', 1);
/**
- * Error constant. Used for differentiating error logging and debugging.
- * Currently PHP supports LOG_DEBUG
- */
+ * Error constant. Used for differentiating error logging and debugging.
+ * Currently PHP supports LOG_DEBUG
+ */
define ('LOG_ERROR', 2);
/**
* CakePHP includes 3 types of session saves
- * database or file. Set this to your preffered method.
- * If you want to use your own save handeler place it in
+ * database or file. Set this to your preferred method.
+ * If you want to use your own save handler place it in
* app/config/name.php DO NOT USE file or database as the name.
* and use just the name portion below.
*
@@ -117,7 +117,7 @@
/**
* Compress output CSS (removing comments, whitespace, repeating tags etc.)
- * This requires a /var/cache directory to be writable by the web server (caching).
+ * This requires a/var/cache directory to be writable by the web server (caching).
* To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use Controller::cssTag().
*/
define('COMPRESS_CSS', false);
@@ -141,6 +141,6 @@
* To use Access Control Lists with Cake...
*/
define('ACL_CLASSNAME', 'DB_ACL');
-define('ACL_FILENAME', 'dbacl'.DS.'db_acl');
+define('ACL_FILENAME', 'dbacl'.DS.'db_acl');
?>
@@ -48,8 +48,8 @@
* PostgreSQL set the connect to either pg_pconnect of pg_connect
* SQLite set the connect to sqlite_popen sqlite_open
* ADOdb set the connect to one of these
- * (http://phplens.com/adodb/supported.databases.html) and
- * append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
+ * (http://phplens.com/adodb/supported.databases.html) and
+ * append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
*
* host =>
* the host you connect to the database
@@ -59,21 +59,21 @@
*/
class DATABASE_CONFIG
{
- var $default = array('driver' => 'mysql',
+ var $default = array('driver' => 'mysql',
'connect' => 'mysql_pconnect',
'host' => 'localhost',
'login' => 'user',
'password' => 'password',
'database' => 'project_name',
- 'prefix' => '');
+ 'prefix' => '');
- var $test = array('driver' => 'mysql',
+ var $test = array('driver' => 'mysql',
'connect' => 'mysql_pconnect',
'host' => 'localhost',
'login' => 'user',
'password' => 'password',
'database' => 'project_name-test',
- 'prefix' => '');
+ 'prefix' => '');
}
?>
View
@@ -3,22 +3,22 @@
/**
* Short description for file.
- *
+ *
* In this file, you set up routes to your controllers and their actions.
- * Routes are very important mechanism that allows you to freely connect
+ * Routes are very important mechanism that allows you to freely connect
* different urls to chosen controllers and their actions (functions).
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
@@ -31,8 +31,8 @@
*/
/**
- * Here, we are connecting '/' (base path) to controller called 'Pages',
- * its action called 'display', and we pass a param to select the view file
+ * Here, we are connecting '/' (base path) to controller called 'Pages',
+ * its action called 'display', and we pass a param to select the view file
* to use (in this case, /app/views/pages/home.thtml)...
*/
$Route->connect ('/', array('controller'=>'pages', 'action'=>'display', 'home'));
@@ -1,7 +1,7 @@
-# @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
-# @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
-# @since CakePHP v 0.10.8.1997
-# @version $Revision$
+-- @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
+-- @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+-- @since CakePHP v 0.10.8.1997
+-- @version $Revision$
CREATE TABLE cake_sessions (
id varchar(255) NOT NULL default '',
View
@@ -3,20 +3,20 @@
/**
* Short description for file.
- *
+ *
* Long description for file
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
@@ -46,16 +46,16 @@
*/
function make_clean_css ($path, $name)
{
- require(VENDORS.'csspp'.DS.'csspp.php');
+ require(VENDORS.'csspp'.DS.'csspp.php');
- $data = file_get_contents($path);
- $csspp = new csspp();
- $output = $csspp->compress($data);
+ $data = file_get_contents($path);
+ $csspp = new csspp();
+ $output = $csspp->compress($data);
- $ratio = 100-(round(strlen($output)/strlen($data), 3)*100);
- $output = " /* file: $name, ratio: $ratio% */ " . $output;
+ $ratio = 100-(round(strlen($output)/strlen($data), 3)*100);
+ $output = " /* file: $name, ratio: $ratio% */ " . $output;
- return $output;
+ return $output;
}
/**
@@ -67,50 +67,50 @@ function make_clean_css ($path, $name)
*/
function write_css_cache ($path, $content)
{
- if (!is_dir(dirname($path)))
+ if (!is_dir(dirname($path)))
mkdir(dirname($path));
-
- $cache = new File($path);
- return $cache->write($content);
+
+ $cache = new File($path);
+ return $cache->write($content);
}
-if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs))
- die('Wrong file name.');
+if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs))
+ die('Wrong file name.');
$filename = 'css/'.$regs[1];
$filepath = CSS.$regs[1];
$cachepath = CACHE.'css'.DS.str_replace(array('/','\\'), '-', $regs[1]);
if (!file_exists($filepath))
- die('Wrong file name.');
+ die('Wrong file name.');
if (file_exists($cachepath))
{
- $templateModified = filemtime($filepath);
- $cacheModified = filemtime($cachepath);
-
- if ($templateModified > $cacheModified)
- {
+ $templateModified = filemtime($filepath);
+ $cacheModified = filemtime($cachepath);
+
+ if ($templateModified > $cacheModified)
+ {
$output = make_clean_css ($filepath, $filename);
write_css_cache ($cachepath, $output);
- }
- else
- {
+ }
+ else
+ {
$output = file_get_contents($cachepath);
- }
+ }
}
-else
+else
{
- $output = make_clean_css ($filepath, $filename);
- write_css_cache ($cachepath, $output);
+ $output = make_clean_css ($filepath, $filename);
+ write_css_cache ($cachepath, $output);
}
header("Date: ".date("D, j M Y G:i:s ", $templateModified).'GMT');
header("Content-Type: text/css");
header("Expires: ".gmdate("D, j M Y H:i:s", time()+DAY)." GMT");
-header("Cache-Control: cache"); // HTTP/1.1
-header("Pragma: cache"); // HTTP/1.0
+header("Cache-Control: cache");// HTTP/1.1
+header("Pragma: cache");// HTTP/1.0
print $output;
?>
View
@@ -37,13 +37,13 @@
if (!defined('ROOT'))
{
- //define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS LOCATED DO NOT ADD A TRAILING DIRECTORY SEPARATOR';
+//define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS LOCATED DO NOT ADD A TRAILING DIRECTORY SEPARATOR';
define('ROOT', dirname(dirname(dirname(__FILE__))));
}
if (!defined('APP_DIR'))
{
- //define('APP_DIR', 'DIRECTORY NAME OF APPLICATION';
+//define('APP_DIR', 'DIRECTORY NAME OF APPLICATION';
define ('APP_DIR', basename(dirname(dirname(__FILE__))));
}
@@ -53,7 +53,7 @@
*/
if (!defined('CAKE_CORE_INCLUDE_PATH'))
{
- //define ('CAKE_CORE_INCLUDE_PATH', FULL PATH TO DIRECTORY WHERE CAKE CORE IS INSTALLED DO NOT ADD A TRAILING DIRECTORY SEPARATOR';
+//define ('CAKE_CORE_INCLUDE_PATH', FULL PATH TO DIRECTORY WHERE CAKE CORE IS INSTALLED DO NOT ADD A TRAILING DIRECTORY SEPARATOR';
define('CAKE_CORE_INCLUDE_PATH', ROOT);
}
@@ -62,7 +62,7 @@
///////////////////////////////
if (!defined('DS'))
{
- define('DS', DIRECTORY_SEPARATOR);
+ define('DS', DIRECTORY_SEPARATOR);
}
if (!defined('WEBROOT_DIR'))
@@ -3,21 +3,21 @@
/**
* Short description for file.
- *
+ *
* This file includes js vendor-files from /vendor/ directory if they need to
* be accessible to the public.
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
- * Copyright (c) 2006, Cake Software Foundation, Inc.
+ * Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
@@ -34,7 +34,7 @@
*/
if(is_file('../../vendors/javascript/'.$_GET['file']) && (preg_match('/(.+)\\.js/', $_GET['file'])))
{
- readfile('../../vendors/javascript/'.$_GET['file']);
+ readfile('../../vendors/javascript/'.$_GET['file']);
}
?>
Oops, something went wrong.

0 comments on commit a75e089

Please sign in to comment.