Commit graph

722 commits

Author SHA1 Message Date
mark_story
cc2d8e2fec Moving limit from the options to the normal paging params. This fixes a few notice errors. 2010-12-19 13:15:04 -05:00
mark_story
8c3ceff50d Making paging.options only contain options that are not in the defaults. This replaces the many diffs that were calculated on each url generation between paging.options and paging.defaults. 2010-12-19 12:58:07 -05:00
mark_story
ef84d86cf5 Reformatting code, and removing merging of defaults key in the helper. It no longer exists. 2010-12-19 12:26:28 -05:00
mark_story
f54479e566 Adding some docblock info about pagination. 2010-12-19 12:20:12 -05:00
mark_story
e9d3fcf5cf Moving limit checking into a separate method, and adding tests.
Removing $scope from being passed down to the options, it previously only allowed additional conditions to be set.
Updated tests.
2010-12-19 11:58:35 -05:00
mark_story
1e741de84b Removing show alias, it was undocumented and untested. 2010-12-19 02:14:37 -05:00
mark_story
108a6611a8 Moving validation of sorting to a separate method. This makes it easier to test, extends and read.
Tests added.
2010-12-19 02:12:39 -05:00
mark_story
7b11eeb6e0 Updating tests to not use the deprecated Controller::$passedArgs.
Removing messy and hard to understand defaults + whitelisting from paginate() now that it has a separate method.
2010-12-19 01:57:51 -05:00
mark_story
6b3db0a3eb Pulling out parameter merging logic into a method, this allows specific typing of parameter merging (named, querystring, route). Also simplifies whitelisting of request parameters.
Tests added for merging and whitelisting.
2010-12-19 01:42:23 -05:00
mark_story
7585b2941e Adding paramType to the test cases. 2010-12-19 00:38:20 -05:00
mark_story
54c52d85fb Fixing failing tests in PaginatorComponent. 2010-12-18 17:29:47 -05:00
mark_story
6b9d9f4aea Reapplying changes in [33d2f9a6ed] as they got lost when the paginator component was extracted. 2010-12-18 17:17:43 -05:00
mark_story
a6cca7c036 Extracting a method from paginator component. 2010-12-18 17:09:30 -05:00
mark_story
de7b324444 Fixing more strict warnings.
Removing & on component callbacks.
Updating incorrect method signatures.
2010-12-18 00:03:03 -05:00
mark_story
a054695dca Fixing failing tests. 2010-12-15 22:08:24 -05:00
Jeremy Harris
9e74283b90 Merge branch '2.0-1353' into 2.0 2010-12-14 20:42:03 -08:00
Jeremy Harris
904cb8a4a6 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-12-14 20:30:58 -08:00
Jeremy Harris
9fa1bec0cb Move Controller::paginate() into PaginatorComponent 2010-12-14 18:21:39 -08:00
mark_story
bd951791f4 Removing forced start of sessions now that they are lazily started. 2010-12-13 23:59:57 -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
Jeremy Harris
7ed19eae88 Allowed comma-delimited list in smtp $to var to be consistent with standard mail delivery. Fixes #1353 2010-12-11 15:11:54 -08: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
mark_story
55e06ec244 Merge branch '2.0-config' into 2.0
Conflicts:
	cake/libs/configure.php
2010-12-05 23:00:05 -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
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
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
244de1df85 Adding a comment about the messageId property and shells. Refs #1303 2010-11-22 13:01:14 -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
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
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -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
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
Mark Story
b86bec14b5 Removing dead code in EmailComponent.
Fixes #1248
2010-10-31 00:00:54 -04:00
mark_story
f61e8b48b6 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-24 20:58:58 -04:00
Juan Basso
cda0ce4727 Testing the build of XML. If it is invalid will generate a Exception. 2010-10-24 22:42:05 -02:00
mark_story
22239b4481 Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript. 2010-10-24 20:26:31 -04:00
mark_story
1c25e627ad Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100.
Fixes #1205, Fixes #1204
2010-10-18 22:06:12 -04:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
a0a84d1a8d Changing pattern used to read digest auth data. Allows emails to be used as usernames.
This also adds the realm to the return value of SecurityComponent::parseDigestAuth().  Fixes #1181
2010-10-11 22:35:47 -04:00
Juan Basso
c95c808f88 Merge with 2.0-xml 2010-10-10 23:21:56 -03:00