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
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