Host name fixed (a redirect causes an error), duplicate code rewrriten to be more...

[core.git] / inc / classes / main / resolver / controller / class_BaseControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index 0c39b385e170c0a70d0f839cb688394fb110622a..3cef50bbeed71227f77a027e8a8740c6c41d83e0 100644 (file)
--- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
@@ -22,11 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseControllerResolver extends BaseResolver {
-       /**
-        * Prefix for local, remote or other resolver
-        */
-       private $controllerPrefix = '';
-
        /**
         * Validated controller name
         */
@@ -43,26 +38,6 @@ class BaseControllerResolver extends BaseResolver {
                parent::__construct($className);
        }
 
-       /**
-        * Setter for controller prefix
-        *
-        * @param       $controllerPrefix       Last validated controllerPrefix
-        * @return      void
-        */
-       protected final function setControllerPrefix ($controllerPrefix) {
-               $this->controllerPrefix = $controllerPrefix;
-       }
-
-       /**
-        * Getter for controller prefix
-        *
-        * @param       $controllerPrefix       Last validated controllerPrefix
-        * @return      void
-        */
-       protected final function getControllerPrefix () {
-               return $this->controllerPrefix;
-       }
-
        /**
         * Setter for controller name
         *
@@ -94,25 +69,25 @@ class BaseControllerResolver extends BaseResolver {
         */
        protected function loadController ($controllerName) {
                // Cache default command
-               $defaultController = $this->getConfigInstance()->getConfigEntry('default_' . strtolower($this->getControllerPrefix()) . '_command');
+               $defaultController = $this->getConfigInstance()->getConfigEntry('default_' . strtolower($this->getClassPrefix()) . '_command');
 
                // Init controller instance
                $controllerInstance = null;
 
                // Default controller
-               $this->setClassName($this->getControllerPrefix() . 'DefaultNewsController');
+               $this->setClassName($this->getClassPrefix() . 'DefaultNewsController');
 
                // Generate the class name
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
                if ($controllerName != $defaultController) {
                        // Create controller class name
-                       $className = $this->getControllerPrefix() . '' . $this->convertToClassName($controllerName) . 'Controller';
+                       $className = $this->getClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
 
                        // ... and set it
                        $this->setClassName($className);
                } else {
                        // No news at main command or non-news command
-                       $this->setClassName($this->getControllerPrefix() . 'DefaultNewsController');
+                       $this->setClassName($this->getClassPrefix() . 'DefaultNewsController');
                }
                //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
 
@@ -126,7 +101,7 @@ class BaseControllerResolver extends BaseResolver {
                $resolverConfigEntry = '';
 
                // Try to read a config entry for our resolver including controller name... ;-)
-               $resolverConfigEntry = sprintf("%s_cmd_%s_resolver_class", strtolower($this->getControllerPrefix()), strtolower($controllerName));
+               $resolverConfigEntry = sprintf("%s_cmd_%s_resolver_class", strtolower($this->getClassPrefix()), strtolower($controllerName));
 
                // Get the config, this will throw an exception if there is no special command resolver
                $resolverClass = $this->getConfigInstance()->getConfigEntry($resolverConfigEntry);
@@ -167,7 +142,7 @@ class BaseControllerResolver extends BaseResolver {
                } // END - if
 
                // Create class name
-               $className = $this->controllerPrefix . $this->convertToClassName($controllerName) . 'Controller';
+               $className = $this->getClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
 
                // Now, let us create the full name of the controller class
                $this->setClassName($className);
@@ -178,9 +153,9 @@ class BaseControllerResolver extends BaseResolver {
                        if (class_exists($this->getClassName())) {
                                // This class does exist. :-)
                                $isValid = true;
-                       } elseif ($this->getClassName() != $this->controllerPrefix.'DefaultNewsController') {
+                       } elseif ($this->getClassName() != $this->getClassPrefix() . 'DefaultNewsController') {
                                // Set default controller
-                               $this->setClassName($this->controllerPrefix . 'DefaultNewsController');
+                               $this->setClassName($this->getClassPrefix() . 'DefaultNewsController');
                        } else {
                                // All is tried, give it up here
                                throw new DefaultControllerException($this, self::EXCEPTION_DEFAULT_CONTROLLER_GONE);