tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FEATURE: Added RequestHandler->allowedActions() to return a unified representation (including extensions) of all allowed actions on a controller.

Browse Source 
BUGFIX: Updated Controller->hasAction() to use RequestHandler->allowedActions() so that extension actions are recognised.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88508 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew Short 2009-10-11 00:07:26 +00:00 committed by Sam Minnee
parent 06fbb96f88
commit 72592d8c14
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/control/RequestHandler.php
View File

@ -176,6 +176,33 @@ class RequestHandler extends ViewableData {
return $this;
}
/**
* Get a unified array of allowed actions on this controller (if such data is available) from both the controller
* ancestry and any extensions.
*
* @return array|null
*/
public function allowedActions() {
$actions = Object::combined_static(get_class($this), 'allowed_actions', 'RequestHandler');
foreach($this->extension_instances as $extension) {
if($extensionActions = Object::get_static(get_class($extension), 'allowed_actions')) {
$actions = array_merge($actions, $extensionActions);
}
}
if($actions) {
// convert all keys and values to lowercase to allow for easier comparison, unless it is a permission code
array_change_key_case($actions, CASE_LOWER);
foreach($actions as $key => $value) {
if(is_numeric($key)) $actions[$key] = strtolower($value);
}
return $actions;
}
}
/**
* Checks if this request handler has a specific action (even if the current user cannot access it).
*
@ -186,7 +213,7 @@ class RequestHandler extends ViewableData {
if($action == 'index') return true;
$action = strtolower($action);
$actions = Object::combined_static($this->class, 'allowed_actions', 'RequestHandler');
$actions = $this->allowedActions();
if(is_array($actions)) {
if(array_key_exists($action, $actions) || in_array($action, $actions)) {
@ -207,25 +234,9 @@ class RequestHandler extends ViewableData {
*/
function checkAccessAction($action) {
$action = strtolower($action);
$allowedActions = Object::combined_static(get_class($this), 'allowed_actions');
$newAllowedActions = array();
// merge in any $allowed_actions from extensions
if($this->extension_instances) foreach($this->extension_instances as $extension) {
if($extAccess = Object::get_static($extension->class, 'allowed_actions')) {
$allowedActions = array_merge($allowedActions, $extAccess);
}
}
$allowedActions = $this->allowedActions();
if($allowedActions) {
// Convert all keys and values to lowercase for easier comparison.
// Exclude values set as booleans, or permission codes (permission checks are case sensitive)
foreach($allowedActions as $key => $value) {
if(is_numeric($key) || is_bool($value)) $value = strtolower($value);
$newAllowedActions[strtolower($key)] = $value;
}
$allowedActions = $newAllowedActions;
// check for specific action rules first, and fall back to global rules defined by asterisk
foreach(array($action,'*') as $actionOrAll) {
// check if specific action is set