Code sync from ship-simu code (all class config entries must end with _class!)

[mailer.git] / inc / classes / main / resolver / web / class_WebControllerResolver.php

diff --git a/inc/classes/main/resolver/web/class_WebControllerResolver.php b/inc/classes/main/resolver/web/class_WebControllerResolver.php
index b5f66e85314c923e1e952b8b0bb76ea75b4f52b7..0585196bc06c999fcaa3fe3adb7afd2a2424763a 100644 (file)
--- a/inc/classes/main/resolver/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/web/class_WebControllerResolver.php
@@ -126,7 +126,9 @@ class WebControllerResolver extends BaseResolver implements ControllerResolver {
        }
 
        /**
-        * "Loads" a given controller and instances it if not yet cached
+        * "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       $commandName                    A controller name we shall look for
         * @return      $controllerInstance             A loaded controller instance
@@ -150,6 +152,7 @@ class WebControllerResolver extends BaseResolver implements ControllerResolver {
                $class = "WebDefaultController";
 
                // Generate the class name
+               //* DEBUG: */ echo __METHOD__.": Command=".$commandName;
                if ($commandName != $defaultCommand) {
                        // Create controller class name
                        $class = sprintf("Web%sController",
@@ -162,6 +165,7 @@ class WebControllerResolver extends BaseResolver implements ControllerResolver {
                        // No nes at "home" page
                        $class = "WebDefaultController";
                }
+               //* DEBUG: */ echo ", controller=".$class."<br />\n";
 
                // Is this class loaded?
                if (!class_exists($class)) {
@@ -176,7 +180,7 @@ class WebControllerResolver extends BaseResolver implements ControllerResolver {
                } // END - if
 
                // Initiate the resolver and controller
-               $resolverInstance = ObjectFactory::createObjectByConfiguredName('web_cmd_resolver', array($commandName, $this->getApplicationInstance()));
+               $resolverInstance = ObjectFactory::createObjectByConfiguredName('web_cmd_resolver_class', array($commandName, $this->getApplicationInstance()));
                $controllerInstance = ObjectFactory::createObjectByName($class, array($resolverInstance));
 
                // Remove resolver