X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fmenu%2Fclass_BaseMenu.php;h=7bb97e169a27674ddfb3f9d3c31dc4ac54d75cf3;hb=5203f9bd014ad46fbc7ee54e7223dcd46e14e3b4;hp=69672112211647fcb77c454f12bc82e2f81b0952;hpb=0088a32f8609875b6151dfa516f7c2d92fa3a5a8;p=core.git

diff --git a/inc/classes/main/menu/class_BaseMenu.php b/inc/classes/main/menu/class_BaseMenu.php
index 69672112..7bb97e16 100644
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -2,11 +2,11 @@
 /**
  * A general menu system class
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
  * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
  * @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
@@ -47,35 +47,41 @@ class BaseMenu extends BaseFrameworkSystem {
 		$this->setTemplateInstance($templateInstance);
 
 		// Load the menu template for all
-		$this->getTemplateInstance()->loadMenuTemplate('generic_menu_entries');
+		$templateInstance->loadMenuTemplate('generic_menu_entries');
 
-		// Get the 'page' from request instance
-		$page = $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page');
+		// Get the 'command' from request instance
+		$command = $this->getApplicationInstance()->getRequestInstance()->getRequestElement('command');
+
+		// If page is empty, choose default
+		if (empty($command)) {
+			// Use default page as none has been specified
+			$command = $this->getConfigInstance()->getConfigEntry('default_' . $this->getApplicationInstance()->getAppShortName() . '_' . self::getResponseTypeFromSystem() . '_command');
+		} // END - if
 
 		// Load the menu template for this page
 		try {
-			$this->getTemplateInstance()->loadMenuTemplate($page . '_menu_entries');
-		} catch (FileIoException $e) {
-			// @TODO Should we log it here? We should, because it will be silently ignored.
+			$templateInstance->loadMenuTemplate($command . '_menu_entries');
+		} catch (FileNotFoundException $e) {
+			// Log exception @TODO Maybe to intrusive?
+			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: Exception caught: ' . $e->__toString() . ', with message: ' . $e->getMessage());
 		}
 
-		// Get the prepared content
-		$menuContent = $this->getTemplateInstance()->getRawTemplateData();
-
-		// Render it here
-		$this->getTemplateInstance()->renderXmlContent($menuContent);
+		// Render template data here
+		$templateInstance->renderXmlContent();
 		//exit(__METHOD__ . ':!OK');
 	}
 
 	/**
-	 * Transfers the rendered menu to a given templatex engine by assigning
+	 * Transfers the rendered menu to a given template engine by assigning
 	 * the rendered content with a template variable.
 	 *
 	 * @param	$templateInstance	An instance of a CompileableTemplate class
 	 * @return	void
 	 */
 	public function transferContentToTemplateEngine (CompileableTemplate $templateInstance) {
-		$this->partialStub('templateInstance=' . $templateInstance->__toString());
+		// Assign menu content to variable
+		$templateInstance->assignVariable('menu', $this->getTemplateInstance()->getMenuContent());
+		//* DEBUG */ $templateInstance->debugInstance();
 	}
 }