X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fclass_BaseTemplateEngine.php;h=11e3acc63fe8a13d11576371e5969b52a91bd45b;hp=cb02e4d3fc55f36ebb387d62002f12f6f73b5d76;hb=9e13d89bcd07f84ff5f9761d4662a750b225201b;hpb=1ee35e6d96c456b8e3499bd683f1647aa28bd501

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index cb02e4d3..11e3acc6 100644
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 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.shipsimu.org
  *
@@ -124,7 +124,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	/**
 	 * All template groups except "general"
 	 */
-	private $varGroups = array();
+	private $variableGroups = array();
 
 	/**
 	 * Code begin
@@ -327,7 +327,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
 		// Skip group 'general'
 		if (($groupName != 'general') && ($add === TRUE)) {
-			$this->varGroups[$groupName] = 'OK';
+			$this->variableGroups[$groupName] = 'OK';
 		} // END - if
 	}
 
@@ -359,13 +359,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	/**
 	 * Getter for variable value, throws a NoVariableException if the variable is not found
 	 *
-	 * @param	$varGroup	Variable group to use
+	 * @param	$variableGroup	Variable group to use
 	 * @param	$index		Index in variable array
 	 * @return	$value		Value to set
 	 */
-	private function getVariableValue ($varGroup, $index) {
+	private function getVariableValue ($variableGroup, $index) {
 		// Return it
-		return $this->varStack[$varGroup][$index]['value'];
+		return $this->varStack[$variableGroup][$index]['value'];
 	}
 
 	/**
@@ -396,13 +396,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	/**
 	 * Sets a variable value for given variable group and index
 	 *
-	 * @param	$varGroup	Variable group to use
+	 * @param	$variableGroup	Variable group to use
 	 * @param	$index		Index in variable array
 	 * @param	$value		Value to set
 	 * @return	void
 	 */
-	private function setVariableValue ($varGroup, $index, $value) {
-		$this->varStack[$varGroup][$index]['value'] = $value;
+	private function setVariableValue ($variableGroup, $index, $value) {
+		$this->varStack[$variableGroup][$index]['value'] = $value;
 	}
 
 	/**
@@ -410,12 +410,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	 * variable is already set. If so, the variable got modified, otherwise
 	 * added.
 	 *
-	 * @param	$varGroup		Variable group to use
+	 * @param	$variableGroup		Variable group to use
 	 * @param	$variableName	Variable to set
 	 * @param	$value			Value to set
 	 * @return	void
 	 */
-	protected function setVariable ($varGroup, $variableName, $value) {
+	protected function setVariable ($variableGroup, $variableName, $value) {
 		// Replace all dashes to underscores to match variables with configuration entries
 		$variableName = trim($this->convertDashesToUnderscores($variableName));
 
@@ -425,13 +425,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 		// Is the variable set?
 		if ($index === FALSE) {
 			// Is the stack there?
-			if (!isset($this->varStack[$varGroup])) {
+			if (!isset($this->varStack[$variableGroup])) {
 				// Then initialize it here
-				$this->varStack[$varGroup] = array();
+				$this->varStack[$variableGroup] = array();
 			} // END - if
 
 			// Not found, add it
-			array_push($this->varStack[$varGroup], $this->generateVariableArray($variableName, $value));
+			array_push($this->varStack[$variableGroup], $this->generateVariableArray($variableName, $value));
 		} else {
 			// Then modify it
 			$this->setVariableValue($this->currGroup, $index, $value);
@@ -471,6 +471,15 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 		$this->templateType = (string) $templateType;
 	}
 
+	/**
+	 * Getter for template type
+	 *
+	 * @return	$templateType	The current template's type
+	 */
+	public final function getTemplateType () {
+		return $this->templateType;
+	}
+
 	/**
 	 * Setter for the last loaded template's FQFN
 	 *
@@ -579,15 +588,6 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 		$this->compileOutputPath = (string) $compileOutputPath;
 	}
 
-	/**
-	 * Getter for template type
-	 *
-	 * @return	$templateType	The current template's type
-	 */
-	public final function getTemplateType () {
-		return $this->templateType;
-	}
-
 	/**
 	 * Unsets the given offset in the variable group
 	 *
@@ -712,7 +712,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 				$this->loadTemplate($template, $ext);
 			} else {
 				// Throw it again
-				throw new FileIoException($fqfn, FrameworkFileInputPointer::EXCEPTION_FILE_NOT_FOUND);
+				throw new FileIoException($fqfn, self::EXCEPTION_FILE_NOT_FOUND);
 			}
 		}
 
@@ -742,25 +742,25 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	 * Try to assign an extracted template variable as a "content" or 'config'
 	 * variable.
 	 *
-	 * @param	$varName		The variable's name (shall be content or config)
+	 * @param	$variableName		The variable's name (shall be content or config)
 	 *							by default
 	 * @param	$variableName	The variable we want to assign
 	 * @return	void
 	 */
-	private function assignTemplateVariable ($varName, $var) {
+	private function assignTemplateVariable ($variableName, $var) {
 		// Replace all dashes to underscores to match variables with configuration entries
 		$variableName = trim($this->convertDashesToUnderscores($variableName));
 
 		// Debug message
-		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: varName=' . $varName . ',variableName=' . $variableName);
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: variableName=' . $variableName . ',variableName=' . $variableName);
 
 		// Is it not a config variable?
-		if ($varName != 'config') {
+		if ($variableName != 'config') {
 			// Regular template variables
 			$this->assignVariable($variableName, '');
 		} else {
 			// Configuration variables
-			$this->assignConfigVariable($variableName);
+			$this->assignConfigVariable($var);
 		}
 	}
 
@@ -785,12 +785,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 			// Initialize all missing variables
 			foreach ($variableMatches[3] as $key => $var) {
 				// Variable name
-				$varName = $variableMatches[1][$key];
+				$variableName = $variableMatches[1][$key];
 
 				// Workarround: Do not assign empty variables
 				if (!empty($var)) {
 					// Try to assign it, empty strings are being ignored
-					$this->assignTemplateVariable($varName, $var);
+					$this->assignTemplateVariable($variableName, $var);
 				} // END - if
 			} // END - foreach
 		} // END - if
@@ -1508,10 +1508,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	/**
 	 * Getter for variable group array
 	 *
-	 * @return	$vargroups	All variable groups
+	 * @return	$variableGroups	All variable groups
 	 */
 	public final function getVariableGroups () {
-		return $this->varGroups;
+		return $this->variableGroups;
 	}
 
 	/**