X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcommands%2Fweb%2Fclass_WebLoginCommand.php;h=981ad63a44b4e3a9ea2de5ddeef16ca9e7731c6e;hp=9726e847897f836ebd31443cbfa97771a613f6b8;hb=b7ab7631dd8c6e6c8daf8a3f9f12a757bff883a6;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308

diff --git a/inc/classes/main/commands/web/class_WebLoginCommand.php b/inc/classes/main/commands/web/class_WebLoginCommand.php
index 9726e847..981ad63a 100644
--- a/inc/classes/main/commands/web/class_WebLoginCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginCommand.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
  *
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class WebLoginCommand extends BaseCommand implements Commandable {
+class WebLoginCommand extends BaseCommand implements Commandable, Registerable {
 	/**
 	 * Protected constructor
 	 *
@@ -57,6 +57,9 @@ class WebLoginCommand extends BaseCommand implements Commandable {
 	 * @return	void
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+		// Set request instance as extra instance
+		Registry::getRegistry()->addInstance('extra', $this);
+
 		// Get the application instance
 		$appInstance = $this->getResolverInstance()->getApplicationInstance();
 
@@ -70,7 +73,7 @@ class WebLoginCommand extends BaseCommand implements Commandable {
 		$templateInstance->assignConfigVariable('base_url');
 
 		// Load the master template
-		$masterTemplate = $appInstance->getMasterTemplate();
+		$masterTemplate = $appInstance->buildMasterTemplateName();
 
 		// Load header template
 		$templateInstance->loadCodeTemplate('header');
@@ -98,6 +101,10 @@ class WebLoginCommand extends BaseCommand implements Commandable {
 		// Set title
 		$templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_login_title'));
 
+		// 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_menu_class', array($appInstance));
+
 		// ... and all variables. This should be merged together in a pattern
 		// to make things easier. A cache mechanism should be added between
 		// these two calls to cache compiled templates.