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

BUGFIX: RequestHandler needs some tricks to make sure it knows when allowed_actions hasnt been provided on a class when it has been provided on an extension, now that statics from extensions isnt a feature specific hack

Browse Source
This commit is contained in:
Hamish Friedlander 2012-03-09 16:39:12 +13:00
parent bc3f5ac329
commit 5ff095e561
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
control/RequestHandler.php
View File

@ -216,7 +216,7 @@ class RequestHandler extends ViewableData {
public function allowedActions() { public function allowedActions() {
$actions = Config::inst()->get(get_class($this), 'allowed_actions'); $actions = Config::inst()->get(get_class($this), 'allowed_actions');
if($actions) { if($actions) {
// convert all keys and values to lowercase to // convert all keys and values to lowercase to
// allow for easier comparison, unless it is a permission code // allow for easier comparison, unless it is a permission code
@ -225,7 +225,7 @@ class RequestHandler extends ViewableData {
foreach($actions as $key => $value) { foreach($actions as $key => $value) {
if(is_numeric($key)) $actions[$key] = strtolower($value); if(is_numeric($key)) $actions[$key] = strtolower($value);
} }
return $actions; return $actions;
} }
} }
@ -253,7 +253,7 @@ class RequestHandler extends ViewableData {
if($isKey || $isValue) return true; if($isKey || $isValue) return true;
} }
if(!is_array($actions) || !$this->uninherited('allowed_actions')) { if(!is_array($actions) || !$this->config()->get('allowed_actions', Config::UNINHERITED | Config::EXCLUDE_EXTRA_SOURCES)) {
if($action != 'init' && $action != 'run' && method_exists($this, $action)) return true; if($action != 'init' && $action != 'run' && method_exists($this, $action)) return true;
} }
@ -286,7 +286,7 @@ class RequestHandler extends ViewableData {
return Permission::check($test); return Permission::check($test);
} }
} elseif((($key = array_search($actionOrAll, $allowedActions)) !== false) && is_numeric($key)) { } elseif((($key = array_search($actionOrAll, $allowedActions, true)) !== false) && is_numeric($key)) {
// Case 4: Allow numeric array notation (search for array value as action instead of key) // Case 4: Allow numeric array notation (search for array value as action instead of key)
return true; return true;
} }
@ -297,7 +297,7 @@ class RequestHandler extends ViewableData {
// it should be allowed. // it should be allowed.
if($action == 'index' || empty($action)) return true; if($action == 'index' || empty($action)) return true;
if($allowedActions === null || !$this->uninherited('allowed_actions')) { if($allowedActions === null || !$this->config()->get('allowed_actions', Config::UNINHERITED | Config::EXCLUDE_EXTRA_SOURCES)) {
// If no allowed_actions are provided, then we should only let through actions that aren't handled by magic methods // If no allowed_actions are provided, then we should only let through actions that aren't handled by magic methods
// we test this by calling the unmagic method_exists. // we test this by calling the unmagic method_exists.
if(method_exists($this, $action)) { if(method_exists($this, $action)) {