Commit graph

1277 commits

Author SHA1 Message Date
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
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
mark_story
f847080cbf Changing more php version strings. 2010-10-03 12:46:03 -04:00
mark_story
d83c51cde9 Fixing expiration conditions on CSRF tokens. 2010-10-02 18:27:39 -04:00
mark_story
7f7c202f35 Removing old CSRF token validation checks.
Removing failing test because the feature moved.
Adding tests for expired and wrong keys.
2010-10-02 17:16:40 -04:00
mark_story
ac90916b84 Adding some documentation about token consumption. 2010-10-02 00:22:44 -04:00
mark_story
a10f1478ee Adding support for nonce expiry.
Adding simple time based nonce expiration. This does a simple cleanup on
each request, to remove stale tokens.  Tests added.
2010-10-02 00:20:58 -04:00
mark_story
711e736cd3 Adding very minimal and incomplete implementation of csrf consumption.
Tests added for consuming csrf tokens on each request.
2010-10-01 00:13:34 -04:00
mark_story
dc6b33f80e Making tokens persist across 'requests'.
Removing more serialize/unserialize calls.
2010-09-30 00:26:44 -04:00
mark_story
f5ed91137a Adding csrfCheck related properties.
nonces are now being populated into the session.
2010-09-30 00:18:25 -04:00
mark_story
b088daf045 Adding tests for csrf feature separation.
Removing serialize() calls as they didn't really add anything.
2010-09-30 00:06:38 -04:00
mark_story
237b66d193 Adding support for httpOnly cookies to CookieComponent. Fixes #1127 2010-09-25 23:24:37 -04:00
mark_story
d64bd2a82c Making cookie component not send gobs of headers when being tested.
Making test case pass in cli.
2010-09-24 23:30:01 -04:00
mark_story
b59033687d Making private properties and methods protected so they can be manipulated with mocks. 2010-09-24 23:30:00 -04:00
mark_story
f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
ADmad
b9a7b27ba1 Fixing regression cased by commit d5ffdc288d causing ajax layout to be not auto set for ajax request for html pages. Refs #1099 2010-09-21 00:25:17 +05:30
ADmad
e10d634f91 Mails sent using php's "mail()" function now have header fields terminated by CRLF and body too contains CR and LF only as combination CRLF in compliannce with RFC 2822. Closes #1071 2010-09-19 03:54:32 +05:30
ADmad
d5ffdc288d Including RequestHandler in controller now automatically sends proper content-type and encoding headers for html pages too like it does for other known file types. Closes #1099 2010-09-18 20:20:52 +05:30
mark_story
e91fa68f8e Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105 2010-09-18 00:13:03 -04:00
mark_story
1707c92aa1 Removing duplicated code. 2010-09-14 23:15:10 -04:00
mark_story
f34cfd1f1e Updating EmailComponent to use new methods on the ComponentCollection to ensure it always has a controller reference.
Removing triggerDisabled key as its no longer needed or wanted.
2010-09-14 23:02:38 -04:00
mark_story
273a189e98 Adding some documentation about component callbacks. 2010-09-14 23:01:39 -04:00
mark_story
30589e2cdf Removing dead method. 2010-09-14 22:56:33 -04:00
mark_story
0ef76eb69a Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor. 2010-09-14 22:52:51 -04:00
mark_story
0baaf6801b Removing call to RequestHandler as its just a pass through to the request object which is available in that scope. Updating the test cases to not use deprecated and non-existent things. 2010-09-14 22:12:14 -04:00
mark_story
97dd7c7644 Adding support to ObjectCollection and its subclasses to trigger callbacks on all objects instead of just the enabled ones. Fixes issues where inner components would not get access to the controller as the initialize callback wasn't fired. This fixes some backwards compatibility issues. Tests updated. 2010-09-14 21:57:40 -04:00
mark_story
e4b2fb173b Removing the deprecated properties.
Removing property copying to helpers.
Making the view test cases pass again.
2010-09-13 23:11:59 -04:00
mark_story
a521291afd Adding a __set() method to make some tests pass.
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
2010-09-13 23:11:59 -04:00
mark_story
84565151de Removing all the deprecated properties from Controller.
Adding a __get() method to provide the properties that were moved to CakeRequest.
Tests added.
2010-09-13 23:11:59 -04:00
mark_story
730e373afe Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/cake_session.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/fixtures/data_test_fixture.php
2010-09-12 13:35:46 -04:00
mark_story
e9d194822d Adding more tests for SMTP address formatting. Fixes #1100 2010-09-12 11:48:09 -04:00
mark_story
e4d34b640b Merge branch '2.0-exceptions' into 2.0
Conflicts:
	cake/libs/error.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/error.test.php
2010-09-10 20:31:16 -04:00
mark_story
f8dbeb2b70 Adding documentation for a new feature. 2010-09-09 22:02:36 -04:00
mark_story
4a0e34a0d6 Applying patch from 'jeremyharris' to make RequestHandler::renderAs() accept an array of options that can be used to send a file as a download. Fixes #950 2010-09-09 21:31:34 -04:00
mark_story
d5e906f086 Adding deprecation flags. 2010-09-08 22:49:00 -04:00
mark_story
12338a0c16 Updating instance method calls in AclComponent. 2010-09-08 22:48:21 -04:00
mark_story
5d703c4f50 Fixing + adding imports for Scaffold. 2010-09-08 00:11:37 -04:00
Mark Story
09fd8ba463 Adding stack trace output to the framework errors. 2010-09-06 17:54:48 -04:00
Mark Story
d88da3d579 Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
474ace09c1 Adding CakeResponse to the list of included files for Controller. 2010-09-06 01:11:26 -04:00
Mark Story
2e8a60f932 Removing some mentions of cakeError as its been removed. Also adding information about exceptions that can be raised. 2010-09-02 16:38:19 -04:00
Mark Story
dbdd17f51a Adding test cases from 'euromark' and updating how email addresses are parsed so they are slightly more conformant to RFC 5322. Fixes #1066 2010-09-02 11:16:10 -04:00
mark_story
a8d4015f47 Updating bootstrap process in CLI to match the one in web.
Updating all_libs to use new file.
Updating error_handler test to run in cli.
Updating Controller so it imports required classes.
2010-08-30 22:59:10 -04:00
mark_story
534f6006f8 Adding omitted parent call. 2010-08-29 23:38:46 -04:00
mark_story
612c52bb8b Adding a beforeRender() that automatically escapes all the content sent to errors handled by CakeErrorController. 2010-08-29 23:31:20 -04:00
mark_story
f1164c93d6 Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery. 2010-08-29 21:37:25 -04:00
mark_story
756baeafdb Making CakeErrorController get the most recent request, this will help when using requestAction.
Updating test cases for error404.
Updating ErrorHandler
2010-08-28 23:32:14 -04:00
predominant
04d3353ee4 Adding access specifiers to methods 2010-08-28 15:38:48 +10:00
mark_story
5de88c0f02 Moving CakeErrorController to its own file. 2010-08-28 01:37:39 -04:00
predominant
f7addabcf2 Whitespace removal 2010-08-28 15:27:12 +10:00
mark_story
9485f0a993 Merge branch 'request-response' into 2.0
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
2010-08-28 00:24:07 -04:00
mark_story
2cdb10812d Merge branch '2.0-exceptions' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/tests/cases/dispatcher.test.php
2010-08-28 00:14:34 -04:00
mark_story
dc67b9cacc Moving all the exceptions into one file for the short term. 2010-08-28 00:08:35 -04:00
José Lorenzo Rodríguez
f63b093d24 Merge branch '2.0-request' into 2.0
Still tons of tests failing
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/html.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-08-27 23:31:41 -04:30
mark_story
c4cb629d80 Replacing cakeError with exceptions in Scaffold. 2010-08-27 23:54:00 -04:00
mark_story
b301b0d86e Adding MissingModelException. 2010-08-27 23:04:35 -04:00
mark_story
b5b7595bc0 Fixing issue in scaffold where it accessed $output, which no longer exists. 2010-08-22 12:41:04 -04:00
mark_story
7221f9c3b9 Moving response construction into Controller, this will let controller classes more easily modify the response subclass they want to use.
Test case updated.
2010-08-22 12:31:55 -04:00
mark_story
f46241a6e7 Merge branch '2.0' into 2.0-helpers 2010-08-16 23:02:44 -04:00
mark_story
705e90bef7 Merge branch '1.3' into 2.0-merge
Conflicts:
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
74a12940cb Removing incorrect method implementation.
Adding documentation to Component::beforeRedirect()
Adding documentation to ObjectCollection::trigger().
2010-08-10 23:45:28 -04:00
mark_story
f5bebc9306 Adding an Acl property to AuthComponent and updating tests to use new API's 2010-08-10 23:18:42 -04:00
mark_story
c6a63bae82 Fixing incorrect method call from merge with 1.3 2010-08-10 23:18:42 -04:00
mark_story
db1acb461a Making SessionComponent extend Component. Updating test case. 2010-08-10 23:18:42 -04:00
mark_story
5068d62473 Fixing issue that came up in rebasing. 2010-08-10 23:18:42 -04:00
mark_story
d01708b1ef Adding temporary $View property to controller until I figure out a better way to provide access for it. Test case updated to reflect View not being in the registry anymore. 2010-08-10 23:18:42 -04:00
mark_story
19f008b1a4 Fixing broken tests in HelperCollectionTest
Moving unload into ObjectCollection as its common between 2 child classes, and possibly a 3rd.
2010-08-10 23:18:40 -04:00
mark_story
426d35d66e Fixing string that got changed in a rebase. 2010-08-10 23:18:40 -04:00
mark_story
0f5e881f26 Fixing typo. 2010-08-10 23:18:40 -04:00
mark_story
7b4916e16a Updating AclComponent to new Component API. 2010-08-10 23:18:40 -04:00
mark_story
a4e2f7c55f Updating intialiize() callbacks. Moving $this->_set() int Component::__construct as all the core components did it. Updating constructors and including parent calls. 2010-08-10 23:18:40 -04:00
mark_story
fac97738ce Making Controller use ComponentCollection. 2010-08-10 23:18:39 -04:00
mark_story
256532b8e4 Updating Components to use Component as the parent class. 2010-08-10 23:18:39 -04:00
mark_story
bf75ab5737 Starting to update Component into a base class instead of a loader class. 2010-08-10 23:18:39 -04:00
mark_story
3666643b84 Adding ComponentCollection and a test case. 2010-08-10 23:18:39 -04:00
mark_story
62019888ba Changing file headers to reflect accurate licences and versions created. 2010-08-10 23:18:39 -04:00
José Lorenzo Rodríguez
7e1426e743 Fixing doc block 2010-08-02 19:25:04 -04:30
José Lorenzo Rodríguez
e7c7008781 Changing behavior of RequestHandlerComponent::responseType(), it will return the current content type set int the response object
It will not return null as default as it did prior 2.0
2010-08-02 19:21:52 -04:30
José Lorenzo Rodríguez
1acbf15c00 Removing RequestHandlerComponent::_header() method 2010-08-02 19:17:43 -04:30
José Lorenzo Rodríguez
bbbb81e10a Adding CakeResponse::download() method 2010-08-02 19:10:38 -04:30
José Lorenzo Rodríguez
5fb320f31d Refactoring RequestHandler methods to use the response object 2010-08-02 19:10:01 -04:30
José Lorenzo Rodríguez
4fd032bc10 Refactoring RequestHandlerComponent::mapType() and added response object property to the component 2010-08-02 19:07:26 -04:30
mark_story
3099a15f17 Removing old check for view == 'Theme'. This allows Scaffold to work well with Themed controllers. Test case added. Fixes #255 2010-08-01 22:25:29 -04:00
José Lorenzo Rodríguez
077f71aaa1 Refactoring controller rendering to use the CakeResponse object 2010-08-01 01:38:45 -04:30
José Lorenzo Rodríguez
0824348db1 Removing Controller::output property and refactoring methods to not use it. CakeResponse::body() should be used instead 2010-08-01 01:13:41 -04:30
José Lorenzo Rodríguez
f9c97383e9 Refactored Controller::disableCache() to use the CakeResponse object, method was also deprecated 2010-08-01 00:16:50 -04:30
José Lorenzo Rodríguez
60f504a470 Refactored Controller::header() to use the CakeResponse object, deprecated Controller::header() and Controller::httpCodes() 2010-08-01 00:13:00 -04:30
José Lorenzo Rodríguez
9d104fee73 Refactoring Controller::redirect() to use the CakeResponse object 2010-08-01 00:10:46 -04:30
José Lorenzo Rodríguez
3ab4e09e11 Moving Controller::httpCodes() to CakeResponse 2010-08-01 00:09:09 -04:30
Juan Basso
527446a3d1 Changing the RequestHandler to use new Xml class. 2010-07-28 21:29:12 -03:00
José Lorenzo Rodríguez Urdaneta
4c71dd845e Merge remote branch 'origin/2.0' into 2.0-request
Conflicts:
	cake/libs/controller/components/auth.php
	cake/tests/cases/libs/controller/components/auth.test.php
2010-07-27 22:02:08 -04:30
mark_story
977ffa96be Removing dead properties and methods from SessionComponent.
Sessions should be started as soon as the component is constructed. So there is no reason to have an active()/activate() method.
2010-07-27 22:27:43 -04:00
mark_story
18b6668a34 Moving tests from SessionComponent to CakeSession, as that is where the features actually are. Removing Security.level/Security::inactiveMins() calculations. 2010-07-27 22:27:42 -04:00
mark_story
4b65ebd64f Making SessionComponent mostly a wrapper for CakeSession.
Adding CakeSession::begin() to replace SessionComponent::__start().
Tests updated.  Tests related to autoStart were removed/skipped as that feature isn't really around right now.
2010-07-27 22:27:11 -04:00
mark_story
d38857095a Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/model/model.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
mark_story
572f79be67 Fixing failing tests caused by strtolower() in AuthComponent. 2010-07-20 23:44:25 -04:00
Scott Reeves
ba59c93187 Fixing typo in method description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:14:51 -04:00
Scott Reeves
742bb29118 Fixing typo in variable description for logoutRedirect.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:14:06 -04:00
mark_story
41997b06e1 Fixing issues where mb_internal_encoding() might not be correctly set, causing email subjects to be incorrectly encoded. Tests added. Fixes #904 2010-07-18 20:48:15 -04:00
Ceeram
32ea6d24cf Moving Component::beforeRender triggering to allow components to modify
the view class to use for the render() call.  Fixes #917

Signed-off-by: mark_story <mark@mark-story.com>
2010-07-15 21:54:18 -04:00
mark_story
c9079c8048 Removing magical un-removable plugin concatenation in Controller::loadModel(). Adding test case from 'real34'. Fixes #858 2010-07-13 20:19:31 -04:00
mark_story
5d2c48fd9c Fixing failing tests caused by strtolower() in AuthComponent. 2010-07-10 12:00:09 -04:00
mark_story
413b875eef Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/controller/controller.php
2010-07-10 11:49:58 -04:00
mark_story
0e2a313145 Removing reference operators from controller.
Removing cakeDebug as its no longer used.
2010-07-10 00:32:35 -04:00
mark_story
b7310afddf Removing strtolower() loops on method names, as casing is preserved in php5. 2010-07-09 23:49:48 -04:00
mark_story
b8085cddce Removing PHP5 and all its uses. 2010-07-05 22:19:22 -04:00
mark_story
02e25f7557 Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503 2010-07-05 21:50:36 -04:00
mark_story
a8e5e587c6 Making RequestHandler able to use the accept header to detect and switch layout/view paths. Fixes #729 2010-07-01 12:01:46 -04:00
mark_story
a7a4285a80 Renaming __requestContent to _contentTypeMap 2010-07-01 00:50:53 -04:00
mark_story
427e859b52 Refactoring how prefers() works. Tests updated.
Removing support for array args in setContent().
2010-07-01 00:46:28 -04:00
mark_story
ba287ec99e Updating accepts() and doing some refactoring. 2010-07-01 00:26:15 -04:00
mark_story
8d32ad2821 Starting to update RequestHandler methods to use CakeRequest. RequestHandler will provide alias/mapped access to features in CakeRequest. Tests updated and expanded. 2010-07-01 00:13:13 -04:00
mark_story
8b847cffef Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/helper.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:54:28 -04:00
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
991d035806 Fixing respondAs() so it can be called multiple times. Test cases added for respondAs. Fixes #842 2010-06-30 22:34:33 -04:00
mark_story
7c0cda7ce5 Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2010-06-28 23:41:48 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
José Lorenzo Rodríguez Urdaneta
4689be643b Migrating EmailTest to phpunit 2010-06-25 00:02:20 -04:30
Juan Basso
26d20b6d62 Fixing wrap for html mode in e-mails. Fixes #663 2010-06-21 00:37:25 -03:00
mark_story
2db510d1c1 Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832 2010-06-20 21:47:34 -04:00
mark_story
d1651db9a8 Fixing typo in Scaffold that caused error messages to display incorrectly. Fixes #813 2010-06-11 10:01:02 -04:00
mark_story
e5df32e9d9 Adding omitted documentation information. 2010-06-10 14:23:49 -04:00
José Lorenzo Rodríguez
fa8df12fa0 Converting AuthTest to phpunit. Adding setter and getter method loggedIn() 2010-06-10 00:03:49 -04:30
José Lorenzo Rodríguez
bc71e14041 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit
Conflicts:
	cake/tests/cases/libs/controller/components/session.test.php
2010-06-09 21:01:56 -04:30
Juan Basso
d5ddd8ee5f Fixing check of EHLO/HELO in EmailComponent. Fixes #794 2010-06-09 19:22:06 -03:00
mark_story
2c6bf51bd2 Converting SessionComponent over to PHPUnit.
Adding a few getter/setter methods to fix visibility issues in the test cases.
2010-06-09 17:15:34 -04:00
José Lorenzo Rodríguez
fa1ae280ca Migrating SessionComponentTest to PHPUnit and adding public accessor method for varible in SessionComponent 2010-06-09 09:30:00 -04:30
mark_story
c5e4ab2366 Adding return to RequestHandlerComponent::accepts() as it was missing.
Updating RequestHandlerComponent tests to work with PHPUnit.
2010-06-09 00:02:49 -04:00
mark_story
a88b8dd5b9 Making requestAction() calls that requesthandler creates not remove autoLayout. This fixes issues where ajax layout files would not be rendered.
Tests added.  Fixes #722
2010-06-07 23:43:35 -04:00
Kyle Robinson Young
a9fa7ac240 Fix for auth component userModel with plugins. Fixes #799 2010-06-07 23:19:13 -04:00
Juan Basso
3c27c4c41e Ajusting smtpOption in EmailComponent. Fixes #779 2010-06-03 14:46:20 -03:00
Juan Basso
b480d80c82 Avoid undefined index if not define timeout in EmailComponent. Fixes #779 2010-06-02 18:14:58 -03:00
mark_story
713e6e6287 Fixing parse error that caused scaffold test to not run and not pass. 2010-05-30 22:41:52 -04:00
Juan Basso
74dad04323 Fixing read from SMTP by EmailComponent. Closes #772 2010-05-30 23:29:21 -03:00
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
Juan Basso
e02cb81a67 Reading a smtp response until EOL. Fixes #378 2010-05-29 12:04:29 -03:00
mark_story
f4abc51062 Removing dependency on RequestHandler from Security component. 2010-05-29 00:01:11 -04:00
mark_story
8acb82f567 Updating Security component to use CakeRequest and updating its test case. 2010-05-28 23:57:43 -04:00
Juan Basso
bc3e745673 Support to EHLO in SMTP server for EmailComponent. Fixes #54, #712, #737 2010-05-24 22:24:58 -03:00
mark_story
b73870c33d Removing reference operators in the AclComponent. 2010-05-22 20:20:41 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Robert Sworder
385ceb434e When using Digest Authentication the passwords do not need to be md5 hashed. Removed incorrect comment.
Fixes #733

Signed-off-by: mark_story <mark@mark-story.com>
2010-05-18 22:19:33 -04:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
mark_story
c1c800865c Refactoring repeated blocks of code into a method. 2010-05-17 23:51:41 -04:00
mark_story
f6edbfa6e4 Removing unused properties from Scaffold. 2010-05-17 23:44:11 -04:00
mark_story
ef85fb1247 Making scaffold methods protected instead of private.
Adding visibility keywords
2010-05-17 23:30:04 -04:00
mark_story
1d884cc00f Updating Scaffold to use the CakeRequest object.
Updating Scaffold tests.
2010-05-17 23:11:47 -04:00
mark_story
8b66a905b8 Fixing syntax error caused by bad merge. 2010-05-17 21:57:12 -04:00
mark_story
f114d4299d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php
2010-05-17 21:52:14 -04:00
mark_story
b2d8536b3b Fixing Authcomponent tests. Updating the component + tests to use the new request object.
Deprecating a number of Authcomponent properties.
2010-05-15 00:55:15 -04:00
mark_story
36a71582fc Fixing issues with Controller::referer() and CakeRequest::referer(). Tests updated. 2010-05-15 00:53:15 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
Mark Story
4b637a0f70 Updating more methods to use request object method instead of deprecated methods. 2010-05-08 10:36:20 -04:00
Mark Story
5040eb7227 Updating RequestHandler and its tests to use the features moved to CakeRequest. Marking a number of methods as deprecated. 2010-05-08 00:59:40 -04:00
Mark Story
df910026ee Updating Controller::referer() to use the request object if available. Tests updated. 2010-05-08 00:06:13 -04:00
Mark Story
77264da34a Updating Controller tests to always pass in a CakeRequest. Fixing some notice errors that come up in the test cases. 2010-05-08 00:00:19 -04:00
Mark Story
22161874cb Deprecating a number of Controller properties and adding $request. 2010-05-07 23:46:02 -04:00
Mark Story
26f7fcef3c Updating Controller and its tests to use CakeRequest. 2010-05-06 23:23:13 -04:00
Mark Story
2b7723fd12 Removing reference operators and making Controller::__construct take a CakeRequest. If one is passed all the necessary properties will be populated. This lightens the Dispatcher, and gives more control to the end developer. 2010-05-06 23:18:50 -04:00
Mark Story
1a460e47f1 Removing reference operators in Controller and its tests. 2010-05-06 22:48:48 -04:00
predominant
719836c41d Updated doc block for added HTTP Status. 2010-05-05 10:09:47 +10:00
Mark Story
95dbae8acf Making RequestHandler component carry along a passed status code. This fixes issues where RequestHandler hijacks an redirect(). Fixes #658 2010-05-03 22:07:13 -04:00
predominant
87db966383 Remove PHP5 conditional statements. 2010-05-03 13:36:32 +10:00
predominant
c1eaa4b24c Fixed access and removed @access tags. 2010-05-03 13:28:09 +10:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
ADmad
f386dca6d8 Controller::loadModel() now returns true when model is succesfully instantiated as stated in docblock. Added test case. 2010-05-02 05:34:38 +05:30
ADmad
afd67e534b Fixing parse error created in commit [6d092552e5]. Closes #647 2010-04-30 03:52:39 +05:30
Mark Story
6d092552e5 Updating bake templates and Scaffold to use less sprintf() and more complete sentences in i18n strings. This should make translations easier to do in a gender correct way. Fixes #210 2010-04-28 23:56:07 -04:00
Mark Story
2fab47e740 Updating doc block for EmailComponent::send(). Fixes #633 2010-04-27 22:50:34 -04:00
Mark Story
e111735905 Changing AclBase into AclInterface as it is now an interface.
Splitting the test case into separate test cases for each class.
2010-04-23 23:52:36 -04:00
Mark Story
523eda018e Deprecating AclComponent::revoke() and AclComponent::grant() they were simply aliases that create a larger API with no real benefit. 2010-04-23 23:14:55 -04:00
Mark Story
62982c57b4 Making AclComponent throw exceptions when it encounters an error.
Making AclBase an abstract class.
Adding AclComponent::adapter() for runtime modification of the Acl implementation.
Tests added, updated and fixed.
2010-04-23 23:03:51 -04:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
Mark Story
78f14401ca Fixing issue where using delivery = debug and not using sessions would cause a fatal error. send() will now return the contents that would get written into the session. Fixes #595 2010-04-17 12:27:50 -04:00