X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fweb%2Fclass_WebControllerResolver.php;h=b43274d3e3a16e876e2fc815acbfeafd0106d3a0;hp=5378006099a8c964f98d01ab13826f24133866bb;hb=7e46f248cc9eb9a3cd540b2e864e053f40a46bcd;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 53780060..b43274d3 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, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 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)
@@ -87,7 +87,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 	 */
 	public function resolveController () {
 		// Init variables
-		$controllerName = "";
+		$controllerName = '';
 		$controllerInstance = null;
 
 		// Get the command name 
@@ -108,74 +108,6 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 		// 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]