Kyle Robinson Young
e2a46f76c7
substr() optimizations
2012-03-28 13:07:26 -07:00
Kyle Robinson Young
33ab634aba
Controller $name set optimization
2012-03-28 11:37:27 -07:00
Kyle Robinson Young
319d154aee
Default to loginRedirect, if set, on authError in AuthComponent
...
Implements #2390
Based on the patch written by @dereuromark
2012-03-27 22:51:47 -07:00
Jose Lorenzo Rodriguez
f349c9e34c
Removing hardcoded helpers from Controller and PagesController class since they are now lazy loaded
2012-03-27 23:45:01 -04:30
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
ADmad
4b49a287a6
Show plugin name in error message if a plugin component was requested
2012-03-24 00:22:50 +05:30
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
Kyle Robinson Young
db9c3e5bf3
Remove unused code and correct doc for modelClass
2012-03-20 14:44:14 -07:00
mark_story
c58b61c17b
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
6a55749e27
Fix reading multiple keys in a single request.
...
Fixes #2676
2012-03-15 21:45:48 -04:00
Rachman Chavik
8fdb11121e
Merge branch '2.1' into 2.2
2012-03-15 20:07:26 +07:00
mark_story
f1931e43ef
Add class_exists() check for view class.
...
Check that the view class hasn't already been mapped in the autoloader
before mapping it. This allows developers to map view classes from
plugins.
Fixes #2684
2012-03-14 20:57:11 -04:00
mark_story
4e94ebe710
Fix doc blocks.
2012-03-13 21:04:56 -04:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
5687d97a98
Merge branch '2.1' into 2.2
2012-03-12 20:31:33 -04:00
mark_story
75f1a84069
Fix docs about ordering of callbacks.
...
Refs #GH-555
2012-03-11 21:35:11 -04:00
Ceeram
a4952166f7
make acl methods available in permission model
2012-03-11 17:07:42 +01:00
Thomas Ploch
79cab67be7
Adding missing 'recursive' option to DigestAuthenticate object.
...
Used integer casting in _findUser() method for 'recursive' option.
2012-03-05 11:06:46 +01:00
mark_story
9d1e88ba13
Fix error from previous commit.
2012-03-03 20:22:21 -05:00
mark_story
61aba0f0f8
Fix most coding standard issues in Controller.
2012-03-03 19:27:46 -05:00
mark_story
1ddcde7c86
Fix how $uses is handled.
...
$uses now defaults to true. All falsey values turn some features
off, and most truthy values enable them.
Fixes #2590
2012-02-28 19:35:06 -05:00
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
euromark
22452f61f8
type hinting controllers and views
2012-02-25 19:46:06 -05:00
Ceeram
677f0708dc
create View instance after adding model params for request
2012-02-24 18:16:53 +01:00
Mark Story
9e8152f949
Merge pull request #417 from 0x20h/php-acl
...
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
mark_story
6fda055a1e
Move initialize logic to __construct().
...
Fixes #2582
2012-02-15 14:15:44 -05:00
Thomas Ploch
574b5dcd41
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response
2012-02-13 09:56:39 +01:00
Jose Lorenzo Rodriguez
4f176d4284
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-02-12 21:04:35 -04:30
mark_story
ad09b910ee
Remove pointless comparison.
2012-02-12 10:09:25 -05:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
ab09229d40
Update API docs
...
View switching only happens for known mime types.
Refs #2565
2012-02-11 11:45:06 -05:00
mark_story
7e17da0ae8
Fix notice error when reading empty values.
...
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.
Fixes #2537
2012-02-11 11:33:04 -05:00
mark_story
6f914174a6
Fix issues with double / & leading/trailing /
...
Authorize classes should remove // and leading trailing /
Without this incorrect paths that fail to match nodes can be
generated. This also allows settings[actionPath] to be
permissive in what it accepts.
Fixes #2563
2012-02-11 10:29:18 -05:00
Thomas Ploch
059a5f21ed
Fixed TODO: Refactored setting of Cookies into CakeResponse.
2012-02-09 14:24:10 +01:00
0x20h
3abfaeecf3
Don't let every role inherit from default role. Filter empty aco paths
2012-02-05 15:30:26 +01:00
mark_story
ace9fefb02
Merge branch '2.0' into 2.1
2012-02-03 21:54:50 -05:00
mark_story
ee083e047e
Fix errors with missing sub directories.
...
Missing content-type specific errors shouldn't trigger fatal errors.
Instead a html view should be rendered as a last resort.
Fixes #2537
2012-02-02 21:25:46 -05:00
mark_story
e697c68da5
Uncommented code works better.
2012-02-01 20:24:02 -05:00
mark_story
b03d7ba9b3
Fix reset() missing delivery property.
...
Fixes #2533
2012-02-01 20:20:14 -05:00
mark_story
a4740f02f1
Remove odd inflection.
...
This additional inflection isn't needed. People can type the classname
they want.
Refs #2514
2012-01-29 13:56:53 -05:00
mark_story
e770c7a72d
Split the AclComponent classes up.
...
Refs #2514
2012-01-29 13:54:26 -05:00
Jose Lorenzo Rodriguez
a1daaf5960
Merge branch '2.1-http' into 2.1
2012-01-21 15:51:34 -04:30
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Jose Lorenzo Rodriguez
5df2a0957f
Not sending the response in beforeRender, better let Dispatcher do its work
2012-01-19 22:26:32 -04:30
mark_story
ad304e0b43
Reformat long line.
2012-01-19 21:50:51 -05:00
Stefano Zoffoli
c3b806ce8c
Prevent blackhole auth error where are present multi fields
2012-01-19 17:48:39 +01:00
Jose Lorenzo Rodriguez
979f7a28b5
Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
...
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
28ee27e2dd
Making it possible to cancel the render() process from any beforeRender listener
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3
Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc
Implementing RequestHandler::checkNotModified() as a helper for HTTP caching
2012-01-19 01:08:44 -04:30
0x20h
4532659fed
code cleanup, added some tests
2012-01-18 20:59:44 +01:00
Mark Story
8608caa8a2
Merge pull request #298 from vitorpc/2.0
...
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08:00
Jose Diaz-Gonzalez
6046b8d013
Properly set the current action on CakeRequest when invoking Controller::setAction()
2012-01-15 14:32:09 -05:00
0x20h
9838338976
docblocks
2012-01-13 23:34:35 +01:00
0x20h
bfaea78504
allow more elaborate regex rules
2012-01-13 23:29:23 +01:00
0x20h
95a41af9db
allow multiple roles for a rule to be specified as string or array
2012-01-13 22:02:25 +01:00
0x20h
ef5eead038
use more appropriate array key when passing options to the adapter
2012-01-13 21:55:47 +01:00
0x20h
153152642c
PHP configuration file base Acl implementation
2012-01-13 21:43:48 +01:00
Mark Story
b76f8f8832
Merge pull request #260 from tPl0ch/2.1-authenticate
...
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
2012-01-12 18:53:19 -08:00
mark_story
7877e7f997
Make allow(null) and deny(null) consistent with no args.
...
No arguments and a single null should be handled the same.
Fixes #2461
2012-01-10 20:32:12 -05:00
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc
Fix errors generated when option['order'] is undefined.
...
Fixes #2447
2012-01-08 21:55:51 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
tigrang
015f9957be
Changed order of controller var merging
...
From AppController -> PluginAppController to
PluginAppConroller -> AppController
Fixes #2420
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-29 20:02:00 -05:00
Jose Lorenzo Rodriguez
1651257919
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
2011-12-26 13:06:48 -04:30
Jose Lorenzo Rodriguez
7fdc1cc8d4
Migrating the beforeRedirect callback to the CakeEventManager, reorganizing how events are triggered in controller
2011-12-25 22:48:27 -04:30
Jose Lorenzo Rodriguez
ffa12f4d47
Fixing test and implementing return values for events
2011-12-25 21:52:12 -04:30
Jose Lorenzo Rodriguez
5d67195bf7
Migrating Controller events to use the CakeEventManager
2011-12-25 14:44:34 -04:30
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
d794084d38
More code standards formatting
2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
mark_story
321caf6db6
Fix incorrect value being stored in Auth.redirect.
...
An incorrect value would be stored in Auth.redirect when
a custom route with the `pass` key set.
Fixes #2366
2011-12-15 22:56:39 -05:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
mark_story
545694d84b
Fix undefined variable error.
2011-12-06 12:35:18 -05:00
mark_story
fc4846d676
Move overflow limits to only take effect after expiration.
2011-12-06 12:23:15 -05:00
mark_story
9296f770d5
Adding SecurityComponent::$csrfLimit
...
This property allows you to control the number of tokens
that will be kept active. Its possible to make really large
CSRF collection sizes. Capping the number of tokens allows developers
to better control session sizes.
2011-12-03 20:13:17 -05:00
mark_story
e421b3bc8f
Adding SecurityComponent::generateToken()
...
This method allows end developers to add the csrf tokens
manually, if they aren't added automatically.
Tokens are cheap to generate, simplifying the logic
makes things a bit easier to understand.
2011-12-03 20:13:03 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Jose Lorenzo Rodriguez
f6534d2962
Fixing issue where changing the case for an action in the url would allow the action in the AuthComponent making it accessible to not-logged in users
2011-11-28 00:52:47 -04:30
mark_story
04463c4ee5
Fix errors found in review.
2011-11-27 23:51:49 -05:00
mark_story
cfbc43671e
Starting content type specific error pages.
...
- Adding RequestHandler to the error controller. This allows reuse
of all of Cake's internals.
- Adding a simple JsonView class to do serialized JSON views.
- Adding serialize hooks, and wiring things together.
2011-11-27 23:51:47 -05:00
Kyle Robinson Young
bc0e0b5c05
Add @link to CookieComponent docblocks
2011-11-22 22:32:13 -08:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
mark_story
92aea9de88
Update comment.
2011-11-16 23:17:48 -05:00
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
Ceeram
e5c8a446d6
Add sorting on joined model virtual field, fixes #2250
2011-11-17 00:18:12 +01:00
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Daniel Pakuschewski
841c0c2295
Dropped support for wildcard in AuthComponent::allow()
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2011-11-15 23:01:04 -05:00
Ceeram
2bb4ed01be
Removing _Token from request data.
...
It is not used outside the component and could possibly affect Model::save().
Fixes #2256
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-15 22:51:04 -05:00
mark_story
6e4493cc14
Fix ambiguous content types in RequestHandler.
...
Treat xhtml + html as content types that should trigger no
response/extension setting. They are different but similar in
that they both generally use the same HTML templates.
Fixes #2257
2011-11-15 22:48:54 -05:00
ADmad
f2a58117ca
Moving AppModel, AppController, PagesController out of core to app
2011-11-12 22:30:42 +05:30