TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes an issue where unix users get locked out of the backend

This commit is contained in:
Samuel Georges 2015-02-12 21:02:47 +11:00
parent 2b32fc4718
commit e50a220fae
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/backend/classes/BackendController.php
View File

@ -46,7 +46,11 @@ class BackendController extends ControllerBase
self::$action = $action = isset($params[2]) ? $this->parseAction($params[2]) : 'index';
self::$params = $controllerParams = array_slice($params, 3);
$controllerClass = '\\'.$module.'\Controllers\\'.$controller;
if ($controllerObj = $this->findController($controllerClass, $action, '/modules')) {
if ($controllerObj = $this->findController(
$controllerClass,
$action,
base_path().'/modules'
)) {
return $controllerObj->run($action, $controllerParams);
}
@ -79,17 +83,15 @@ class BackendController extends ControllerBase
* Finds a backend controller with a callable action method.
* @param string $controller Specifies a method name to execute.
* @param string $action Specifies a method name to execute.
* @param string $inPath Base path for class file location.
* @return ControllerBase Returns the backend controller object
*/
protected function findController($controller, $action, $inPath = null)
protected function findController($controller, $action, $inPath)
{
/*
* Workaround: Composer does not support case insensitivity.
*/
if (!class_exists($controller)) {
if (!$inPath) {
$inPath = base_path();
}
$controller = Str::normalizeClassName($controller);
$controllerFile = $inPath.strtolower(str_replace('\\', '/', $controller)) . '.php';
if ($controllerFile = File::existsInsensitive($controllerFile)) {