Commit graph

1115 commits

Author SHA1 Message Date
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