Re-added with access protection

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

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index eec9884d229b3e3835f0cf0c1de5074e1d78bbb0..2b0c17dd8d00ef686abc2616ca869a073f2985e9 100644 (file)
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -136,26 +136,26 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                $controllerInstance = null;
 
                // Default controller
-               $className = "WebDefaultController";
+               $this->setClassName("WebDefaultController");
 
                // Generate the class name
                //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
                if ($controllerName != $defaultController) {
                        // Create controller class name
-                       $className = sprintf("Web%sController",
+                       $this->setClassName(sprintf("Web%sController",
                                $this->convertToClassName($controllerName)
-                       );
+                       ));
                } elseif ($this->getConfigInstance()->readConfig('page_with_news') == $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page')) {
                        // Yes, display news in home then set default controller with news
-                       $className = "WebDefaultNewsController";
+                       $this->setClassName("WebDefaultNewsController");
                } else {
                        // No news at "home" page or non-news page
-                       $className = "WebDefaultController";
+                       $this->setClassName("WebDefaultController");
                }
-               //* DEBUG: */ echo ", controller=".$className."<br />\n";
+               //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
 
                // Is this class loaded?
-               if (!class_exists($className)) {
+               if (!class_exists($this->getClassName())) {
                        // Class not found, so try the default one or throw exception
                        if ($controllerName != $defaultController) {
                                // Try the default controller
@@ -168,7 +168,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 
                // Initiate the resolver and controller
                $resolverInstance = ObjectFactory::createObjectByConfiguredName('web_cmd_resolver_class', array($controllerName, $this->getApplicationInstance()));
-               $controllerInstance = ObjectFactory::createObjectByName($className, array($resolverInstance));
+               $controllerInstance = ObjectFactory::createObjectByName($this->getClassName(), array($resolverInstance));
 
                // Remove resolver
                unset($resolverInstance);