X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcommands%2Fweb%2Fclass_WebConfirmCommand.php;h=6b0a78123d8925f2b0985a757bde759eee4808f7;hp=ca44f8b619a91f4d2fb107b5e7241e397b7fecab;hb=1324b879f1d6d75c95be4a5da9dcdcc8c9a01557;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308

diff --git a/inc/classes/main/commands/web/class_WebConfirmCommand.php b/inc/classes/main/commands/web/class_WebConfirmCommand.php
index ca44f8b6..6b0a7812 100644
--- a/inc/classes/main/commands/web/class_WebConfirmCommand.php
+++ b/inc/classes/main/commands/web/class_WebConfirmCommand.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
  *
@@ -70,7 +70,7 @@ class WebConfirmCommand extends BaseCommand implements Commandable {
 		$templateInstance->assignConfigVariable('base_url');
 
 		// Load the master template
-		$masterTemplate = $appInstance->getMasterTemplate();
+		$masterTemplate = $appInstance->buildMasterTemplateName();
 
 		// Load header template
 		$templateInstance->loadCodeTemplate('header');
@@ -99,11 +99,26 @@ class WebConfirmCommand extends BaseCommand implements Commandable {
 		$templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_confirm_link_title'));
 
 		// Get user instance
-		$userInstance = Registry::getRegistry()->getInstance('user');
+		try {
+			$userInstance = Registry::getRegistry()->getInstance('user');
+		} catch (NullPointerException $e) {
+			// Not found user, e.g. when the user is somehow invalid
+			$responseInstance->redirectToConfiguredUrl('web_cmd_user_is_null');
+		}
 
 		// Set username
 		$templateInstance->assignVariable('username', $userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USERNAME));
 
+		// 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('confirm_menu_class', array($appInstance));
+
+		// Render the menu
+		$menuInstance->renderMenu();
+
+		// Transfer it to the template engine instance
+		$menuInstance->transferToTemplateEngine($templateInstance);
+
 		// ... 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.