Commit graph

3999 commits

Author SHA1 Message Date
mark_story
9e9559b350 Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults. 2009-11-29 16:09:45 -05:00
mark_story
0834cb47ab Removing code from RouterRoute::__mapRoute. All tests passing. 2009-11-29 12:10:09 -05:00
mark_story
b242dc9531 Moving parameter persist to RouterRoute.
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling. 2009-11-29 09:49:19 -05:00
mark_story
889e367510 Expanding and correcting doc block for router::connect. 2009-11-28 23:37:40 -05:00
mark_story
7216925394 Updating doc blocks. 2009-11-28 23:12:44 -05:00
mark_story
a86e414adc Removing Router::stripEscape() and all uses of it.
Router::stripEscape() removed escape patterns supported in DboSource.  Since those escape patterns no longer exist, neither does the need for the escaping of those patterns.
2009-11-28 23:08:52 -05:00
mark_story
d70689ecda Merge branch '1.3-misc' into write-route 2009-11-28 23:04:22 -05:00
mark_story
02f9275e20 Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data. 2009-11-28 23:02:59 -05:00
mark_story
5cbe3dbd39 Removing unused variables. Making loop easier to read. 2009-11-28 21:58:02 -05:00
mark_story
5b4d15dc3b Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on. 2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47 More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together. 2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters. 2009-11-27 17:12:35 -05:00
mark_story
26aa3731e0 Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367 2009-11-27 14:27:32 -05:00
mark_story
49c6cd3f9f Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition. 2009-11-27 09:58:51 -05:00
phpnut
7b78e475ca Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-27 00:55:45 -06:00
phpnut
43fdde2dad Removing unneeded code in Dispatcher::cached();
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76 Expanding tests on Router and RouterRoute. 2009-11-26 23:46:42 -05:00
mark_story
89d0ed8f3b Route compilation tests passing again. 2009-11-26 21:42:33 -05:00
mark_story
8315b48e77 Removing String::getInstance() as it was causing fatal errors when eAccelerator was enabled, and is a deprecated method. 2009-11-26 18:24:14 -05:00
mark_story
18e0537869 Adding variable initialization 2009-11-26 17:50:33 -05:00
phpnut
903a1fd95a Adding new Configure::$App['www_root']
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
ADmad
ad20e43730 Removing unneeded code for minor optimization
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -05:00
mark_story
c4ceeabcf5 More tests and more passing tests for Route compilation.
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70 Starting to refactor RouterRoute::_writeRoute 2009-11-26 00:17:43 -05:00
phpnut
f83a024a10 Increasing code coverage for View and ThemeView 2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5 Refactored last commit changes are:
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp

To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
mark_story
3885466e9a Changing $_this to the easier to type $self. 2009-11-25 23:40:52 -05:00
mark_story
1d7881b16f Renaming connectDefaults to defaults().
Updating tests.
2009-11-25 23:39:07 -05:00
phpnut
21eb001a96 Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp

if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
mark_story
636d944e70 Adding Router::connectDefaults(). Allows the developer to disable Router's automatic generation of routes. 2009-11-25 23:21:10 -05:00
mark_story
52264cb61c Fixing persistent param route exiting.
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3 Merge branch '1.3-misc' into 1.3-router
Conflicts:
	cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
e345b2f788 Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-25 22:23:38 -05:00
phpnut
d685c18720 Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets 2009-11-25 12:41:19 -06:00
phpnut
0977029c89 Removing limit of image, js and css in plugins 2009-11-25 09:47:23 -06:00
phpnut
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot.
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
mark_story
64dffb7663 Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358 2009-11-24 22:49:40 -05:00
mark_story
3b1256cefb Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-24 22:10:11 -05:00
mark_story
69b72083be Adding docblock and removing a call to array_slice() 2009-11-24 22:06:55 -05:00
dogmatic
53bfc8cca2 a new take on toList and more tests for passing a different separator 2009-11-24 22:00:33 -05:00
dogmatic
398113f828 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
mark_story
58446e0785 Adding documentation note about $options['q'] Refs #357 2009-11-24 11:57:56 -05:00
mark_story
72c0e2ca5a Applying minor optimization from 'robustsolution' to Router::connectNamed().
Fixes #312
2009-11-24 09:27:13 -05:00
mark_story
5aba143620 Applying optimization to Controller::postConditions from 'robustsolution' Fixes #287 2009-11-23 12:52:38 -05:00
mark_story
8cdee90b4f Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
6fdaa82969 Merge branch '1.3' into 1.3-merger 2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set. 2009-11-22 21:26:25 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
2e0acbf505 Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304 2009-11-22 17:56:46 -05:00
AD7six
4f3852618f correcting $this -> $self
removing debug code
2009-11-22 19:58:10 +01:00
Juan Basso
c6c7474502 Fix test of the size of lines in MagicDb (included test for it).
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:27:57 -05:00
mark_story
7e889d8495 Changing require_once to require for custom session handlers. If you are using a class to do your custom session handling you must include checks to prevent duplicate class errors. Fixes #324 2009-11-22 12:25:53 -05:00
mark_story
6b3b2a629b Removing CakeSession::__validateKeys() its no longer needed due to CakeSession using Set to manipulate the session values. Adding test case for exploit shown in https://trac.cakephp.org/ticket/2041 2009-11-21 20:44:35 -05:00
mark_story
63b047eb57 Replacing extract with classicExtract. 2009-11-21 20:25:45 -05:00
mark_story
4ea2a3f37d Minor optimization on importing of Cache engines. 2009-11-21 20:05:19 -05:00
mark_story
fa0d0addf8 Making it so Cache::__loadEngine is only called once per classname. 2009-11-21 20:01:33 -05:00
mark_story
46b965edba Refactoring Configure::read/Configure::write so keys with <= 2 keys read/write faster. 2009-11-21 19:57:04 -05:00
mark_story
a729fc4d62 Merge branch '1.3-cache' into 1.3-misc 2009-11-21 17:16:38 -05:00
mark_story
c11509483c Removing use of Helper::output from core helpers.
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
mark_story
d37dd4c49f Updating doc block for FileEngine.
Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.
2009-11-21 16:09:06 -05:00
mark_story
fb7d99e6b3 Making XcacheTest use refactored Cache API. 2009-11-21 15:44:03 -05:00
mark_story
e3e02bfcee Fixing drop() 2009-11-21 15:26:16 -05:00
mark_story
95f8ed5b55 Additional refactoring and code removal. 2009-11-21 15:26:16 -05:00
mark_story
0ba622bb0e Removing debug changes.
Updating isInitialized() to its new use.
Refactoring Cache engines to no longer be singletons with heavy settings manipulation. Instead each config() is a separate instance.
2009-11-21 15:26:16 -05:00
mark_story
3404f1ed39 Adding documentation to Cache::config().
Adding tests for default configuration manipulation of config().
2009-11-21 15:26:16 -05:00
mark_story
d1066bfeaf Updating FileLog to include File if it does not already exist, fixes possible fatal errors if log was written to during the bootstrap process. 2009-11-21 15:21:19 -05:00
mark_story
b1c89496c5 Fixing typo in Cache doc block.
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
2009-11-21 15:19:11 -05:00
mark_story
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -05:00
Juan Basso
71df8dbbba Replace function sizeof (alias) by count.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
Juan Basso
52fcabc96a Little optimization in redirect of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:47:42 -05:00
Juan Basso
1cef0ac981 Little optimization in postConditions of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:46:49 -05:00
Juan Basso
911a99bf23 Replace function preg_split by explode when possible.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:52 -05:00
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
Juan Basso
9b6b258fed Replace function is_integer (alias) by is_int.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:36:10 -05:00
renan.saddam
4a8808eb21 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:35:29 -02:00
renan.saddam
a33bd1d144 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:28:11 -02:00
predominant
97239f0259 Adding newline. 2009-11-18 22:28:03 +11:00
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01:00
mark_story
9eb1950646 Removing duplicate condition check. Fixes #314 2009-11-16 20:10:08 -05:00
mark_story
925fda7ba6 Updating core layout, and skel layout to reflect changes in session->flash().
Updating skel layout to use $this->Helper.
2009-11-16 20:01:55 -05:00
Jippi
e6801c22e1 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 23:19:11 +00:00
Jippi
f078b0aeda Fixed Router::url() not being able to leave an URL with persist parameters 2009-11-16 23:16:49 +00:00
Jippi
2cb0c3acb3 Changed SessionHelper::flash to return message instead of echoing it 2009-11-16 23:15:24 +00:00
phpnut
cc11230925 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 10:14:35 -06:00
phpnut
7211541821 Removing 1024 char limit when using fgets() 2009-11-16 10:14:03 -06:00
predominant
a91108a81a Adding version check to getCharsetName() for MySQL Datasource. 2009-11-16 13:49:52 +11:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
0783176238 Replacing duplicated code with pluginSplit().
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
28d3488cb2 Adding file headers to config files in test app.
Updating doc blocks.
Updating formatting.
2009-11-15 18:09:04 -05:00
ceeram
7a4793a20c refactoring Configure::load() to load config files from plugins, tests and config files added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-15 17:56:49 -05:00
mark_story
63ab96d751 Setting $primary = false inside DboSource::queryAssociation. Fixed #208 2009-11-15 17:48:41 -05:00
predominant
0049c9ad81 Renaming Helper::__name to Helper::_name for proper access level for extension overloading and callback. 2009-11-15 21:18:46 +11:00
mark_story
fa14f9cebc Merge branch '1.3-validation' into 1.3-misc 2009-11-14 20:46:48 -05:00
mark_story
be9f0ec4c7 Renaming method so they match those in Cache.
Removing method that was missed during previous refactor.
Updating tests.
2009-11-14 20:42:57 -05:00
mark_story
b7e7eff738 Fixing doc blocks. 2009-11-14 20:24:18 -05:00