X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fconsole%2Fclass_ConsoleControllerResolver.php;h=f5cbe43f18c7849a01a806011b74749ff136a835;hp=94e1445bc30043d02cae60f0440a606b1bf1b088;hb=aa7ec363e1fd2d22ddda871d6c36cd78b753692c;hpb=bd41407a04990cd8220fafd17e52404c0677fe0b

diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
index 94e1445b..f5cbe43f 100644
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -121,13 +121,13 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 	 */
 	private function loadController ($controllerName) {
 		// Cache default command
-		$defaultController = $this->getConfigInstance()->readConfig('default_web_command');
+		$defaultController = $this->getConfigInstance()->readConfig('default_console_command');
 
 		// Init controller instance
 		$controllerInstance = null;
 
 		// Default controller
-		$this->setClassName('ConsoleDefaultController');
+		$this->setClassName('ConsoleDefaultNewsController');
 
 		// Generate the class name
 		//* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
@@ -137,12 +137,9 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 
 			// ... 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');
+			// No news at main command or non-news command
+			$this->setClassName('ConsoleDefaultNewsController');
 		}
 		//* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
 
@@ -158,14 +155,14 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 		// 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));
+			$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 = 'web_cmd_resolver_class';
+			$resolverConfigEntry = 'console_cmd_resolver_class';
 		}
 
 		// Initiate the resolver and controller