X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fmenu%2Fclass_MenuTemplateEngine.php;h=4f1dd50dd2baed10de46227287fd4e644ba7d6ce;hp=ea98d81913ba2f16a626df60b58fc12893f265d7;hb=c3021952494266e05bfa9046baf9bcd11bfe7d13;hpb=3e1fbf30a631cf1cd64562b69228452c49e0033f

diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php
index ea98d819..4f1dd50d 100644
--- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php
+++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php
@@ -2,11 +2,11 @@
 /**
  * A Menu template engine class
  *
- * @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 - 2011 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
@@ -133,10 +133,10 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		$templateInstance->setMenuInstance($menuInstance);
 
 		// Init a variable stacker
-		$stackerInstance = ObjectFactory::createObjectByConfiguredName('menu_stacker_class');
+		$stackInstance = ObjectFactory::createObjectByConfiguredName('menu_stacker_class');
 
 		// Set it
-		$templateInstance->setStackerInstance($stackerInstance);
+		$templateInstance->setStackInstance($stackInstance);
 
 		// Return the prepared instance
 		return $templateInstance;
@@ -239,7 +239,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 * @return	void
 	 * @throws	XmlNodeMismatchException	If current main node mismatches the closing one
 	 */
-	public function endElement ($resource, $nodeName) {
+	public function finishElement ($resource, $nodeName) {
 		// Make all lower-case
 		$nodeName = strtolower($nodeName);
 
@@ -273,12 +273,12 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		// Is this string empty?
 		if (empty($characters)) {
 			// Then skip it silently
-			return false;
+			return;
 		} // END - if
 
 		// Assign the found characters to variable and use the last entry from
 		// stack as the name
-		parent::assignVariable($this->getStackerInstance()->getNamed('current_node'), $characters);
+		parent::assignVariable($this->getStackInstance()->getNamed('current_node'), $characters);
 	}
 
 	/**
@@ -314,13 +314,13 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function initMenu ($templateDependency = '') {
 		// Get web template engine
-		$this->setTemplateInstance(ObjectFactory::createObjectByConfiguredName('web_template_class', array($this->getApplicationInstance())));
+		$this->setTemplateInstance(ObjectFactory::createObjectByConfiguredName('html_template_class', array($this->getApplicationInstance())));
 
 		// Handle the dependency template
 		$this->handleTemplateDependency('menu', $templateDependency);
 
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'menu');
+		$this->getStackInstance()->pushNamed('current_node', 'menu');
 	}
 
 	/**
@@ -331,7 +331,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startEntryList () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'entry-list');
+		$this->getStackInstance()->pushNamed('current_node', 'entry-list');
 	}
 
 	/**
@@ -341,7 +341,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startBlockHeader () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'block-header');
+		$this->getStackInstance()->pushNamed('current_node', 'block-header');
 	}
 
 	/**
@@ -351,7 +351,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startBlockFooter () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'block-footer');
+		$this->getStackInstance()->pushNamed('current_node', 'block-footer');
 	}
 
 	/**
@@ -361,7 +361,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startBlockList () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'block-list');
+		$this->getStackInstance()->pushNamed('current_node', 'block-list');
 	}
 
 	/**
@@ -371,7 +371,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startBlock () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'block');
+		$this->getStackInstance()->pushNamed('current_node', 'block');
 	}
 
 	/**
@@ -381,7 +381,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startTitle () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'title');
+		$this->getStackInstance()->pushNamed('current_node', 'title');
 	}
 
 	/**
@@ -391,7 +391,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startTitleId () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'title-id');
+		$this->getStackInstance()->pushNamed('current_node', 'title-id');
 	}
 
 	/**
@@ -401,7 +401,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startTitleClass () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'title-class');
+		$this->getStackInstance()->pushNamed('current_node', 'title-class');
 	}
 
 	/**
@@ -411,7 +411,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startTitleText () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'title-text');
+		$this->getStackInstance()->pushNamed('current_node', 'title-text');
 	}
 
 	/**
@@ -421,7 +421,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startEntry () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'entry');
+		$this->getStackInstance()->pushNamed('current_node', 'entry');
 	}
 
 	/**
@@ -431,7 +431,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startEntryId () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'entry-id');
+		$this->getStackInstance()->pushNamed('current_node', 'entry-id');
 	}
 
 	/**
@@ -441,7 +441,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startAnchor () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'anchor');
+		$this->getStackInstance()->pushNamed('current_node', 'anchor');
 	}
 
 	/**
@@ -451,7 +451,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startAnchorId () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'anchor-id');
+		$this->getStackInstance()->pushNamed('current_node', 'anchor-id');
 	}
 
 	/**
@@ -461,7 +461,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startAnchorText () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'anchor-text');
+		$this->getStackInstance()->pushNamed('current_node', 'anchor-text');
 	}
 
 	/**
@@ -471,7 +471,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startAnchorTitle () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'anchor-title');
+		$this->getStackInstance()->pushNamed('current_node', 'anchor-title');
 	}
 
 	/**
@@ -481,7 +481,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startAnchorHref () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'anchor-href');
+		$this->getStackInstance()->pushNamed('current_node', 'anchor-href');
 	}
 
 	/**
@@ -491,7 +491,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startFooterId () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'footer-id');
+		$this->getStackInstance()->pushNamed('current_node', 'footer-id');
 	}
 
 	/**
@@ -501,7 +501,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startFooterClass () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'footer-class');
+		$this->getStackInstance()->pushNamed('current_node', 'footer-class');
 	}
 
 	/**
@@ -511,7 +511,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function startFooterText () {
 		// Push the node name on the stacker
-		$this->getStackerInstance()->pushNamed('current_node', 'footer-text');
+		$this->getStackInstance()->pushNamed('current_node', 'footer-text');
 	}
 
 	/**
@@ -521,7 +521,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishTitle () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -531,7 +531,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishTitleId () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -541,7 +541,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishTitleClass () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -551,7 +551,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishTitleText () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -561,7 +561,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishFooterText () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -571,7 +571,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishFooterClass () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -581,7 +581,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishFooterId () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -591,7 +591,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishAnchorHref () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -601,7 +601,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishAnchorTitle () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -611,7 +611,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishAnchorText () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -621,7 +621,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishAnchorId () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -631,7 +631,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishAnchor () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -641,7 +641,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishEntryId () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -651,7 +651,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishEntry () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -661,7 +661,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishBlock () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -671,7 +671,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishBlockList () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -681,7 +681,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishEntryList () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -691,7 +691,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishBlockHeader () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -701,7 +701,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishBlockFooter () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -711,7 +711,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	private function finishMenu () {
 		// Pop the last entry
-		$this->getStackerInstance()->popNamed('current_node');
+		$this->getStackInstance()->popNamed('current_node');
 	}
 
 	/**
@@ -721,7 +721,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	public function getMenuCacheFqfn () {
 		// Get the FQFN ready
-		$fqfn = sprintf("%s%s%s/%s.%s",
+		$fqfn = sprintf('%s%s%s/%s.%s',
 			$this->getConfigInstance()->getConfigEntry('base_path'),
 			$this->getGenericBasePath(),
 			'menus/_cache',