loadController() is now more generic (TODO: check that all other apps works)

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

diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
index 31dd4681541c38dd450373994133a54cedb9811c..35430d4342cd94d17c060e526b6874af14d262e6 100644 (file)
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -108,82 +108,6 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                // Return the maybe resolved instance
                return $controllerInstance;
        }
-
-       /**
-        * "Loads" a given controller and instances it if not yet cached. If the
-        * controller was not found one of the default controllers will be used
-        * depending on wether news shall be displayed.
-        *
-        * @param       $controllerName                 A controller name we shall look for
-        * @return      $controllerInstance             A loaded controller instance
-        * @throws      InvalidControllerException      Thrown if even the requested
-        *                                                                              controller class is missing (bad!)
-        */
-       private function loadController ($controllerName) {
-               // Cache default command
-               $defaultController = $this->getConfigInstance()->readConfig('default_console_command');
-
-               // Init controller instance
-               $controllerInstance = null;
-
-               // Default controller
-               $this->setClassName('ConsoleDefaultController');
-
-               // Generate the class name
-               //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
-               if ($controllerName != $defaultController) {
-                       // Create controller class name
-                       $className = 'Console' . $this->convertToClassName($controllerName) . 'Controller';
-
-                       // ... and set it
-                       $this->setClassName($className);
-               } elseif ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page')) {
-                       // Yes, display news in home then set default controller with news
-                       $this->setClassName('ConsoleDefaultNewsController');
-               } else {
-                       // No news at home page or non-news page
-                       $this->setClassName('ConsoleDefaultController');
-               }
-               //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
-
-               // Is this class loaded?
-               if (!class_exists($this->getClassName())) {
-                       // Throw an exception here
-                       throw new InvalidControllerException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-               } // END - if
-
-               // Set default resolver config name
-               $resolverConfigEntry = '';
-
-               // Try to read a config entry for our resolver including controller name... ;-)
-               try {
-                       // Create the resolver name
-                       $resolverConfigEntry = sprintf("console_cmd_%s_resolver_class", strtolower($controllerName));
-
-                       // Get the config, this will throw an exception if there is no special command resolver
-                       $resolverClass = $this->getConfigInstance()->readConfig($resolverConfigEntry);
-               } catch (ConfigEntryNotFoundException $e) {
-                       // Use default resolver entry
-                       // @TODO Maybe we need to log this?
-                       $resolverConfigEntry = 'console_cmd_resolver_class';
-               }
-
-               // Initiate the resolver and controller
-               $resolverInstance = ObjectFactory::createObjectByConfiguredName(
-                       $resolverConfigEntry,
-                       array(
-                               $controllerName,
-                               $this->getApplicationInstance()
-                       )
-               );
-               $controllerInstance = ObjectFactory::createObjectByName(
-                       $this->getClassName(),
-                       array($resolverInstance)
-               );
-
-               // Return the result
-               return $controllerInstance;
-       }
 }
 
 // [EOF]