Prefixes used from attribute

[core.git] / inc / classes / main / resolver / command / web / class_WebCommandResolver.php

diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
index 0ebd4e8adf423d556aff8699c44577289f5c70bb..0e5e65de018edc51e0e6c4d1a0b161065241de76 100644 (file)
--- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
+++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
@@ -37,7 +37,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                parent::__construct(__CLASS__);
 
                // Set prefix to "Web"
-               $this->setCommandPrefix("Web");
+               $this->setCommandPrefix('Web');
        }
 
        /**
@@ -85,11 +85,11 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                $commandName = '';
                $commandInstance = null;
 
-               // This goes fine so let's resolv the command
+               // This goes fine so let's resolve the command
                $commandName = $requestInstance->getRequestElement('page');
 
                // Is the command empty? Then fall back to default command
-               if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_web_command');
+               if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command');
 
                // Check if command is valid
                if ($this->isCommandValid($commandName) === false) {
@@ -125,7 +125,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                $commandInstance = null;
 
                // Is the command empty? Then fall back to default command
-               if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_web_command');
+               if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command');
 
                // Check if command is valid
                if ($this->isCommandValid($commandName) === false) {
@@ -149,14 +149,11 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
         *                                                                              command class is missing (bad!)
         */
        private function loadCommand ($commandName) {
-               // Cache default command
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command');
-
                // Init command instance
                $commandInstance = null;
 
                // Create class name
-               $className = 'Web' . $this->convertToClassName($commandName) . 'Command';
+               $className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command';
 
                // Create command class name
                $this->setClassName($className);
@@ -164,7 +161,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception
-                       throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
+                       throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
                } // END - if
 
                // Initiate the command