X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcommands%2Fweb%2Fclass_WebLoginAreaCommand.php;h=5a364e5ee79401d1e64f5abf8748b4ddc725bdd4;hp=673858d8facfd72bf5c0bc8c239150019aa53dac;hb=d26e71af1e28dc1429823bdec244df6303f9b2fb;hpb=5e89637b5069092a60b8a6c38b670bf0cf7aa4fd

diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index 673858d8..5a364e5e 100644
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command for the login area (member/gamer area)
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebLoginAreaCommand (CommandResolver $resolverInstance) {
+	public static final function createWebLoginAreaCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebLoginAreaCommand();
 
@@ -84,19 +84,19 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
 		} // END - if
 
 		// Get the application instance
-		$appInstance = $this->getResolverInstance()->getApplicationInstance();
+		$applicationInstance = $this->getResolverInstance()->getApplicationInstance();
 
 		// Prepare a template instance
-		$templateInstance = $this->prepareTemplateInstance($appInstance);
+		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
 
 		// Assign base URL
 		$templateInstance->assignConfigVariable('base_url');
 
 		// Assign all the application's data with template variables
-		$templateInstance->assignApplicationData($appInstance);
+		$templateInstance->assignApplicationData($applicationInstance);
 
 		// Load the master template
-		$masterTemplate = $appInstance->buildMasterTemplateName();
+		$masterTemplate = $applicationInstance->buildMasterTemplateName();
 
 		// Load header template
 		$templateInstance->loadCodeTemplate('header');
@@ -134,7 +134,13 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
 
 		// Construct the menu in every command. We could do this in BaseCommand class. But this means
 		// *every* command has a navigation system and that is want we don't want.
-		$menuInstance = ObjectFactory::createObjectByConfiguredName('login_area_menu_class', array($appInstance));
+		$menuInstance = ObjectFactory::createObjectByConfiguredName('login_area_menu_class', array($applicationInstance));
+
+		// Render the menu
+		$menuInstance->renderMenu();
+
+		// Transfer it to the template engine instance
+		$menuInstance->transferContentToTemplateEngine($templateInstance);
 
 		// ... and all variables. This should be merged together in a pattern
 		// to make things easier. A cache mechanism should be added between
@@ -154,16 +160,16 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
 	 */
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Default is no action
-		$actionInstance = null;
+		$actionInstance = NULL;
 
 		// Get registry
 		$registryInstance = Registry::getRegistry();
 
 		// Get our application instance from the registry
-		$appInstance = $registryInstance->getInstance('application');
+		$applicationInstance = $registryInstance->getInstance('application');
 
 		// Default action is the one from configuration
-		$this->actionName = $this->convertDashesToUnderscores($appInstance->getAppShortName()) . '_login_' . $this->getConfigInstance()->readConfig('login_default_action');
+		$this->actionName = $this->convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $this->getConfigInstance()->getConfigEntry('login_default_action');
 
 		// Get "action" from request
 		$actReq = $requestInstance->getRequestElement('action');
@@ -171,7 +177,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
 		// Do we have a "action" parameter set?
 		if ((is_string($actReq)) && (!empty($actReq))) {
 			// Then use it with prefix
-			$this->actionName = $this->convertDashesToUnderscores($appInstance->getAppShortName()) . '_login_' . $actReq;
+			$this->actionName = $this->convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $actReq;
 		} // END - if
 
 		// Get application instance