From 0503b85c287363000e853ca10f712126c8964cde Mon Sep 17 00:00:00 2001 From: coderkun Date: Sun, 22 Sep 2013 21:41:38 +0200 Subject: [PATCH] correct trifles --- agents/BottomlevelAgent.inc | 28 ---------------------- core/Linker.inc | 2 +- exceptions/ControllerNotFoundException.inc | 1 - exceptions/ControllerNotValidException.inc | 1 - views/error.tpl | 2 +- www/.htaccess | 2 +- 6 files changed, 3 insertions(+), 33 deletions(-) diff --git a/agents/BottomlevelAgent.inc b/agents/BottomlevelAgent.inc index 95629e48..37816614 100644 --- a/agents/BottomlevelAgent.inc +++ b/agents/BottomlevelAgent.inc @@ -20,34 +20,6 @@ */ abstract class BottomlevelAgent extends \nre\core\Agent { - - - - - /** - * Load a BottomlevelAgent. - * - * @throws AgentNotFoundException - * @throws AgentNotValidException - * @param string $agentName BottomlevelAgent name - */ - public static function load($agentName) - { - // Load class - parent::load_agent($agentName, Autoloader::getClassName(get_class())); - - // Determine full classname - $className = Autoloader::concatClassNames($agentName, Autoloader::getClassType(get_class())); - - // Validate class - try { - ClassLoader::check($className, get_class()); - } - catch(ClassNotValidException $e) { - throw new AgentNotValidException($e->getClassName()); - } - } - } ?> diff --git a/core/Linker.inc b/core/Linker.inc index 61dd5fa8..5496d2b9 100644 --- a/core/Linker.inc +++ b/core/Linker.inc @@ -299,7 +299,7 @@ // Determine prefix $ppos = array(strlen($uri)); - if(($p = strpos($uri, '/'.$request->getParam(1, \nre\configs\AppConfig::$defaults['intermediate']))) !== false) { + if(($p = strpos($uri, '/'.$request->getParam(1, 'intermediate'))) !== false) { $ppos[] = $p; } $prefix = substr($uri, 0, min($ppos)); diff --git a/exceptions/ControllerNotFoundException.inc b/exceptions/ControllerNotFoundException.inc index 56c4a3fd..90859c49 100644 --- a/exceptions/ControllerNotFoundException.inc +++ b/exceptions/ControllerNotFoundException.inc @@ -42,7 +42,6 @@ */ function __construct($controllerName) { - // Elternkonstruktor aufrufen parent::__construct( $controllerName, self::MESSAGE, diff --git a/exceptions/ControllerNotValidException.inc b/exceptions/ControllerNotValidException.inc index e309469d..0c945bcb 100644 --- a/exceptions/ControllerNotValidException.inc +++ b/exceptions/ControllerNotValidException.inc @@ -42,7 +42,6 @@ */ function __construct($controllerName) { - // Elternkonstruktor aufrufen parent::__construct( $controllerName, self::MESSAGE, diff --git a/views/error.tpl b/views/error.tpl index 2f177be3..f45b01a0 100644 --- a/views/error.tpl +++ b/views/error.tpl @@ -2,7 +2,7 @@ - + Service Unavailable diff --git a/www/.htaccess b/www/.htaccess index 45d60053..63163a80 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -1,7 +1,7 @@ RewriteEngine On - RewriteBase / + RewriteBase / RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(.*)$ index.php?url=$1 [QSA,L,NE]