Commit graph

1160 commits

Author SHA1 Message Date
Jeremy Harris
9fa1bec0cb Move Controller::paginate() into PaginatorComponent 2010-12-14 18:21:39 -08:00
mark_story
2fe60142f5 Fixing more strict warnings. 2010-12-12 21:09:56 -05:00
mark_story
495061537f Changing Scaffold to use exceptions to indicate error states.
Starting to convert record deletion to POST only.
2010-12-12 12:59:25 -05:00
mark_story
661195db6c Updating __() use in scaffold to take advantage of sprintf() being built into __() now. 2010-12-12 12:44:48 -05:00
mark_story
44c080d5ad Making all core classes throw CakeException subclasses, this allows developers to catch framework exceptions with one catch.
Adding package specific exceptions.
Replacing generic exceptions in the codebase with CakeException + package exceptions.
2010-12-11 19:26:10 -05:00
mark_story
ceca179184 Fixing more tests that were failing post merge. 2010-12-10 23:17:42 -05:00
mark_story
1e108748e9 Fixing validation methods + features lost in [f51ce734] due to a bad
merge.
Fixing additional tests to reflect changes in 2.0
2010-12-10 22:52:22 -05:00
mark_story
b9f0fc0724 Merge branch '1.3' into merger
Conflicts:
	cake/dispatcher.php
	cake/libs/cake_session.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/set.php
	cake/libs/validation.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
Graham Weldon
33d2f9a6ed Refs #621. Provides default maxLimit for pagination to prevent url manipulation causing long queries. 2010-12-10 12:22:12 +11:00
mark_story
55e06ec244 Merge branch '2.0-config' into 2.0
Conflicts:
	cake/libs/configure.php
2010-12-05 23:00:05 -05:00
mark_story
5f47de7658 Adding @package tags.
Moving MissingModelException with the other exceptions.
2010-12-05 00:02:20 -05:00
mark_story
d202ea643d Fixing issue loading plugin models when uses == false. 2010-12-04 23:49:00 -05:00
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
mark_story
ae814db2dd Changing IniAcl to use IniReader. 2010-12-04 14:47:47 -05:00
Graham Weldon
dd18efbe7c Append Controller to error class name for isAuthorized() not implemented. 2010-12-04 22:21:10 +11:00
Graham Weldon
1dbed85979 Append Controller to error class name for isAuthorized() not implemented. 2010-12-04 22:14:33 +11:00
Marko Marković
c55a57927c Typos in documentation: reguired -> required 2010-12-01 08:12:25 +11:00
Mark Story
40585a34e8 Adding support for userPath in IniAcl.
Test case added.
Fixes #1291
2010-11-28 21:22:10 -05:00
Mark Story
3ddff879b1 Converting IniAcl to use IniFile, this removes one of the classes responsibilities. 2010-11-28 21:06:22 -05:00
mark_story
cc18c15e61 Fixing coding standards. 2010-11-28 21:05:32 -05:00
ADmad
1186bc56f1 Adding EmailCompnent::lineFeed property toallow overriding the default line feed string when using mail() function to send mail. Closes #1320 2010-11-27 02:11:43 +05:30
mark_story
845edf38e1 Removing core classes using App::import() with an array(). This usage incurs an additional call to App::import().
Removing Set from core class imports, as Set is required as part of the framework bootstrapping.
2010-11-25 22:51:30 -05:00
mark_story
4214242efd Adding test for correct merge order for $uses.
Fixing incorrect merge ordering for $uses, so it matches historical behaviour.
Fixes #1309
2010-11-24 22:44:12 -05:00
mark_story
0e29567f8d Adding an array cast to fix issues where users could modify cookie
values causing iteration errors.  Fixes #1309
2010-11-24 22:09:08 -05:00
mark_story
d5fb0b25cb Fixing issue where Date header would be missing from Emails sent by
EmailComponent.
Adding user configurable field for date.
Test cases added.  Fixes #1304
2010-11-22 22:08:46 -05:00
mark_story
d9484c109f Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-11-22 21:29:33 -05:00
mark_story
d0d16a7eda Fixing i18n extraction errors in Scaffold. Fixes #1305 2010-11-22 21:29:11 -05:00
mark_story
244de1df85 Adding a comment about the messageId property and shells. Refs #1303 2010-11-22 13:01:14 -05:00
mark_story
8a129ec3a0 Adding a normalize parameter to Object::_mergeVars(). This allows existing behavior to be maintained.
Updating Controller and Shell usage to match new parameters.
2010-11-21 00:47:42 -05:00
mark_story
8821bec049 Moving _mergeVars() into Object as its common to Controller, Model and Shell. 2010-11-21 00:14:29 -05:00
mark_story
8f82156a51 Adding _mergeVars to Controller (this duplicated method will be re-factored away).
Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.
2010-11-21 00:14:29 -05:00
mark_story
ae7855692d Removing unserialize() as its dangerous. Instead using | delimited fields for locked fields. This totally avoids issues with serialize(). Removing str_rot13, as its only child proof.
Tests updated.
2010-11-20 23:42:54 -05:00
mark_story
3237402fb8 Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
6d9b000aee Changing how mergeVars are handled, so the difference of app/current is used as a base.
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
mark_story
d12c232d8a Merge branch '1.3' into merger
Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
9b08b725fe Merge branch '2.0' into 2.0-view
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
01894b315f Fixing issues caused by not accessing the request object correctly. 2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
mark_story
47fa4713b1 Pulling ScaffoldView into a separate file. 2010-11-12 22:54:28 -05:00
mark_story
6c0dfe9592 Fixing error where params[url] has moved. 2010-11-09 23:44:33 -05:00
Ceeram
bc7770aa83 removing useless calls to mapActions()
Signed-off-by: mark_story <mark@mark-story.com>
2010-11-07 23:16:41 -05:00
mark_story
e431e86aa4 Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added. 2010-11-07 20:53:04 -05:00
mark_story
3216c902cd Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
22497eb41c Fixing failing tests in controller test. 2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8 Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated. 2010-11-07 13:23:45 -05:00
mark_story
1bc6433ecd Removing duplicate import() and fixing missing dependency. 2010-11-07 13:23:43 -05:00
Mark Story
c2063f1229 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-31 21:58:38 -04:00
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Juan Basso
7f448a1d35 Allowed the use of empty() and isset() in Controllers aliases properties. 2010-10-31 22:02:26 -02:00
Mark Story
b86bec14b5 Removing dead code in EmailComponent.
Fixes #1248
2010-10-31 00:00:54 -04:00