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
49c11a8219
More work allowing assets in themes and plugins.
2009-11-25 11:06:28 -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
c94702506d
Fixing fails in Set::reverse caused by _log property being removed from Object.
2009-11-22 21:31:44 -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
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
ceeram
cd6fd74caf
Added -empty flag for ProjectTask to bake with empty dir files, tests included
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 18:18:14 -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
mark_story
6c3bcdd7e6
Removing commented code.
2009-11-22 17:34:11 -05: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
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
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
3f067ed166
Updating ApcEngine test to use the new Cache engine api.
2009-11-21 15:26:17 -05:00
mark_story
5ff2e66f75
Updating memcache test to use new Cache api.
...
Removing most private access in the test case.
2009-11-21 15:26:17 -05:00
mark_story
266cddb4db
Removing whitespace.
2009-11-21 15:26:16 -05:00
mark_story
4b184ceccb
Updating FileEngine test to use new Cache api methods.
2009-11-21 15:26:16 -05:00
mark_story
14d643ff99
Fixing File cache test to run with modified Cache API.
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
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
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
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
burzum
67cea6d21c
Fixing a problem with setting Paginator::sort() defaults directon to desc
2009-11-17 02:11:23 +01:00
Jippi
e6801c22e1
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-16 23:19:11 +00:00
Jippi
2cb0c3acb3
Changed SessionHelper::flash to return message instead of echoing it
2009-11-16 23:15:24 +00:00
mark_story
aa97daeea9
Updating test due to merge conflicts.
2009-11-15 20:09:35 -05: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
a292ef0f16
Adding ability to provide default plugin value to pluginSplit().
2009-11-15 19:54:33 -05:00
mark_story
20a114a1cd
Adding $dotAppend to pluginSplit()
2009-11-15 19:12:00 -05:00
mark_story
db0c030557
Adding pluginSplit and test case. pluginSplit consolidates a number of repeated code blocks.
2009-11-15 18:16:12 -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
31102ad412
Adding tests for App::pluginPath that were omitted before.
2009-11-15 16:38:02 -05:00
mark_story
0b2fc5b35f
Adding tests for phone() pass through to localized class.
2009-11-14 20:52:11 -05:00
mark_story
fa14f9cebc
Merge branch '1.3-validation' into 1.3-misc
2009-11-14 20:46:48 -05:00
mark_story
b452e8367f
Adding tests for CakeLog::drop()
2009-11-14 20:44:42 -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
fb483e9bff
Adding file headers.
2009-11-14 20:25:45 -05:00
mark_story
b7e7eff738
Fixing doc blocks.
2009-11-14 20:24:18 -05:00
mark_story
70820e2e96
Renaming unconfig to drop.
2009-11-14 20:18:58 -05:00
mark_story
caedbdf98a
Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs.
...
Tests added.
2009-11-14 20:10:40 -05:00
mark_story
040f94cb81
Adding test case files used for previous commit.
2009-11-14 20:10:40 -05:00
