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
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
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
30589e2cdf
Removing dead method.
2010-09-14 22:56:33 -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
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
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
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
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
predominant
04d3353ee4
Adding access specifiers to methods
2010-08-28 15:38:48 +10:00
predominant
f7addabcf2
Whitespace removal
2010-08-28 15:27:12 +10: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
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
db1acb461a
Making SessionComponent extend Component. Updating test case.
2010-08-10 23:18:42 -04:00
mark_story
426d35d66e
Fixing string that got changed in a rebase.
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
256532b8e4
Updating Components to use Component as the parent class.
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
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
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
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
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
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