X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fweb%2Fclass_WebControllerResolver.php;h=8cf46cc47a1e271ede60563c3be166e4d2b9edeb;hb=c6d8f7eb4020504335a62e07a8ead8d40868cde7;hp=7c7e58ce9876b5876d4f0c5b3ee0147e829f851d;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae;p=core.git

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 7c7e58ce..8cf46cc4 100644
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -25,7 +25,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 	/**
 	 * Last successfull resolved controller (name)
 	 */
-	private $lastControllerName = "";
+	private $lastControllerName = '';
 
 	/**
 	 * Last successfull resolved controller (instance)
@@ -41,8 +41,8 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set prefix to "Web"
-		$this->setControllerPrefix("Web");
+		// Set prefix to 'Web'
+		$this->setClassPrefix('Web');
 	}
 
 	/**
@@ -54,7 +54,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidControllerException	Thrown if default controller is invalid
 	 */
-	public final static function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) {
+	public static final function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new WebControllerResolver();
 
@@ -87,7 +87,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 	 */
 	public function resolveController () {
 		// Init variables
-		$controllerName = "";
+		$controllerName = '';
 		$controllerInstance = null;
 
 		// Get the command name 
@@ -103,79 +103,11 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 		} // END - if
 
 		// Set last controller
-		$this->lastControllerInstance = $controllerInstance;
+		$this->setResolvedInstance($controllerInstance);
 
 		// 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_web_command');
-
-		// Init controller instance
-		$controllerInstance = null;
-
-		// Default controller
-		$this->setClassName('WebDefaultController');
-
-		// Generate the class name
-		//* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
-		if ($controllerName != $defaultController) {
-			// Create controller class name
-			$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
-			$this->setClassName('WebDefaultNewsController');
-		} else {
-			// No news at home page or non-news page
-			$this->setClassName('WebDefaultController');
-		}
-		//* 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("web_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
-			$resolverConfigEntry = "web_cmd_resolver_class";
-		}
-
-		// Initiate the resolver and controller
-		$resolverInstance = ObjectFactory::createObjectByConfiguredName($resolverConfigEntry, array($controllerName, $this->getApplicationInstance()));
-		$controllerInstance = ObjectFactory::createObjectByName($this->getClassName(), array($resolverInstance));
-
-		// Remove resolver (we don't need it anymore)
-		unset($resolverInstance);
-
-		// Return the result
-		return $controllerInstance;
-	}
 }
 
 // [EOF]