Commit graph

1276 commits

Author SHA1 Message Date
mark_story
d8f2cf9395 Starting to remove magic around userModel, and deprecating/removing userModel from AuthComponent. 2011-02-03 22:46:28 -05:00
mark_story
b59d0e8bb1 Replacing Authcomponent::$flashElement with Authcomponent::$flash, which gives access to all the flash parameters. Also adding a wrapper method for more terse code and ability to extend functionality. 2011-02-03 22:46:28 -05:00
mark_story
ff889c2c8e Renaming method names, no need to include Objects, its implied. 2011-02-03 22:46:28 -05:00
mark_story
1696df7201 Removing the last of actionMap from AuthComponent. Its been moved into the authorization objects.
Updating and adding tests for crud_authorize.
2011-02-03 22:46:27 -05:00
mark_story
e11917ae94 Removing public properties that aren't used anymore. 2011-02-03 22:46:27 -05:00
mark_story
0c7f9149ca Refactoring authorization objects to also use settings, it makes them consistent with authenticate objects.
Making actionPath automatically pass into authentication objects.
Adding tests.
2011-02-03 22:46:27 -05:00
mark_story
7ea914938f Changing AuthComponent::login() so you can provide an array of user data to manually login a user. Leaving $user blank will attempt to identify the user using the request. 2011-02-03 22:46:27 -05:00
mark_story
f21970c533 Making AuthComponent::mapActions() delegate to the authorize objects. Adding tests. 2011-02-03 22:46:27 -05:00
mark_story
3f9c83c43d Authentication and Authorization objects are integrated with AuthComponent. Minimal App changes are needed as legacy settings are forwarded. 2011-02-03 22:46:27 -05:00
mark_story
ced832ba62 Fixing issues with FormAuthenticate and plugin models. 2011-02-03 22:46:27 -05:00
mark_story
6860f7cc03 Starting to integrate Authorization objects into AuthComponent.
Tests updated and duplicate tests skipped, they will eventually be removed when duplication is confirmed.
2011-02-03 22:46:27 -05:00
mark_story
2e9d9479a6 Moving another part of AuthComponent's authorize strategies into BaseAuthorize.
Implementing CrudAuthorize and adding tests for it.
2011-02-03 22:46:26 -05:00
mark_story
7207dccc7c Adding ActionsAuthorize. It implements using Acl as the authorization object. 2011-02-03 22:46:26 -05:00
mark_story
4058e7f48c Extracting a base class, as it will be needed.
Moving AuthComponent::action() into the authorize object base as that's where its used.
2011-02-03 22:46:26 -05:00
mark_story
67c9acbc94 Adding a doc block. 2011-02-03 22:46:26 -05:00
mark_story
16b3beec5e Starting ControllerAuthorize adding it and the test cases. 2011-02-03 22:46:26 -05:00
mark_story
693360bc9e Removing isAuthorized() as there is no need for it once AuthComponent is updated. 2011-02-03 22:46:26 -05:00
mark_story
1c827573ce Adding doc blocks for FormAuthenticate. 2011-02-03 22:46:26 -05:00
mark_story
68da3fab8f Starting to extract authentication objects out of AuthComponent. Started off with extracting FormAuthenticate as its what currently exists in AuthComponent. Test case added. 2011-02-03 22:46:25 -05:00
Phally
f3812342c2 Minor optimization for email linefeeds. 2011-01-31 00:15:56 +01:00
mark_story
6db8515e60 Fixing incorrectly nested sprintf + __ call. Refs #1305 2011-01-30 12:25:40 -05:00
Joe Beeson
e58e3f3132 Fix to resolve 'assign by reference' errors when using a '__get' magic method.
Fixes #1476

Signed-off-by: mark_story <mark@mark-story.com>
2011-01-21 15:52:03 -05:00
Juan Basso
e64e29964d Implemented the beforeRedirect callback in controller. 2011-01-20 21:27:40 -02:00
mark_story
dca3fecfed Merge branch '1.3' into merger
Conflicts:
	cake/console/error.php
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/cake_schema.php
	cake/libs/router.php
	cake/libs/set.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/text.php
	cake/libs/view/view.php
	cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -05:00
mark_story
b94edefb2c Removing the last vestiges of the enable parameter.
Fixing issue where isset() stupidly plods along when doing a string index of a string.
Updating DbAcl to use proper settings array.
Fixes #1467
2011-01-18 19:33:57 -05:00
mark_story
932533c5c8 Fixing incorrect content type headers from being set, when an action contains a requestAction to an action with a different Content-Type. Also populating RequestHandler->params as it was always empty.
Fixes #1445
2011-01-18 08:28:16 -05:00
Jeremy Harris
1f0c57c4ee Fixed aliasing so it works with plugins in the 'className' key 2011-01-14 17:44:33 -08:00
Jeremy Harris
39e06b0425 Updated documentation 2011-01-13 18:06:32 -08:00
Jeremy Harris
2b596859cb Reversed alias and actual class to be more consistent with how Model aliases load and to make migration easier 2011-01-13 18:04:06 -08:00
Jeremy Harris
1f1d920ff7 Allowed components to be aliased by setting the 'alias' key 2011-01-09 18:27:44 -08:00
mark_story
443f6d1c5b Merge branch '1.3' into merger
Conflicts:
	cake/console/shells/tasks/test.php
	cake/libs/cake_log.php
	cake/libs/controller/components/email.php
	cake/libs/set.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/time.php
	cake/libs/view/view.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/shells/tasks/test.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
mark_story
8754d11aed Adding EmailComponent::_getSocket() so EmailComponent + smtp is easier to test.
Fixing issue where hosts with portnames could cause smtp emails to fail.
Added tests, fixed an existing test to not depend on a local mailserver.
Fixes #1433
2011-01-06 23:10:01 -05:00
mark_story
7dd1eea285 Updating documentation for paginator helper, and component. 2010-12-28 22:26:33 -05:00
mark_story
5092013304 Making EmailComponent register and un-register its view object, when rendering email templates. This allows helpers to use the view to do additional processing. Fixes #442 2010-12-27 15:12:27 -05:00
mark_story
5ce66d3031 Changing how PaginatorComponent::paginate()'s $whitelist param works. It now serves as the whitelist for fields ordering can be done on. It previously allowed you to whitelist things you passed into paginate(), which was kind of useless.
Updated tests.
Fixes #430
2010-12-26 21:30:43 -05:00
mark_story
f62a067d7c Making it possible for behaviors to define paginate and paginateCount. Updated test to ensure the component calls the correct methods.
Fixes #1373
2010-12-26 17:40:34 -05:00
mark_story
ee3017599d Merge branch '2.0' into 2.0-pagination
Conflicts:
	cake/libs/controller/components/paginator.php
	cake/libs/router.php
2010-12-24 14:43:11 -05:00
mark_story
ef77e60cb0 Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
3c6fc55eed Removing strlower() calls as they are not needed in php5 land. 2010-12-21 23:45:47 -05:00
mark_story
d5589d26bd more doc blocks. 2010-12-21 22:27:17 -05:00
mark_story
e5588f746c Reversing changes that required a : sigil for named parameters. Also removing ?foo style parameters for querystring args. Having two ways to create querystring args was not sitting well with me.
Tests updated.
2010-12-19 23:11:02 -05:00
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
6206fefcee Starting to switch to a _mergeParent. This will allow un skipping of many tests, and make mergeVars more flexible. 2010-12-15 23:44:43 -05:00
mark_story
a054695dca Fixing failing tests. 2010-12-15 22:08:24 -05:00
Jeremy Harris
7416e58759 Allowed comma-delimited list in smtp $to var to be consistent with standard mail delivery. Fixes #1353 2010-12-14 20:55:34 -08: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
mark_story
7b4ffa2ee9 Fixing incorrect exception type. 2010-12-14 23:24:37 -05:00
Jeremy Harris
b9143dc7d4 Added ControllerTestCase class for testing controllers. Fixes #1244 2010-12-14 19:58:27 -08:00
mark_story
478d158133 Removing a var_dump because I'm a muppet. 2010-12-14 22:52:31 -05: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
53a687049c Fixing encoding of address aliases. They are now mime-encoded like other headers. Tests added. Fixes #1360 2010-12-13 23:23:02 -05: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
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
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