Moved getter near it's setter counter part to have them next to each other.
[core.git] / inc / classes / main / template / class_BaseTemplateEngine.php
index 8a58b46d1d6d4d2c4f1950861087b4a9d19a24fe..306867ff7b12ec71077acd39767934e6578a853c 100644 (file)
@@ -2,11 +2,11 @@
 /**
  * A generic template engine
  *
- * @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 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
@@ -87,12 +87,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        /**
         * Loaded raw template data
         */
-       private $loadedRawData = null;
+       private $loadedRawData = NULL;
 
        /**
         * Raw templates which are linked in code templates
         */
-       private $rawTemplates = null;
+       private $rawTemplates = NULL;
 
        /**
         * A regular expression for variable=value pairs
@@ -106,6 +106,11 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         */
        private $regExpCodeTags = '/\{\?([a-z_]+)(:("[^"]+"|[^?}]+)+)?\?\}/';
 
+       /**
+        * A regular expression to find template comments like <!-- Comment here //-->
+        */
+       private $regExpComments = '/<!--[\w\W]*?(\/\/){0,1}-->/';
+
        /**
         * Loaded helpers
         */
@@ -131,10 +136,21 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         */
        private $codeEnd = '?>';
 
+       /**
+        * Language support is enabled by default
+        */
+       private $languageSupport = TRUE;
+
+       /**
+        * XML compacting is disabled by default
+        */
+       private $xmlCompacting = FALSE;
+
        // Exception codes for the template engine
        const EXCEPTION_TEMPLATE_TYPE_IS_UNEXPECTED   = 0x110;
        const EXCEPTION_TEMPLATE_CONTAINS_INVALID_VAR = 0x111;
        const EXCEPTION_INVALID_VIEW_HELPER           = 0x112;
+       const EXCEPTION_VARIABLE_IS_MISSING           = 0x113;
 
        /**
         * Protected constructor
@@ -145,28 +161,45 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
+
+               // Init file I/O instance
+               $ioInstance = ObjectFactory::createObjectByConfiguredName('file_io_class');
+
+               // Set it
+               $this->setFileIoInstance($ioInstance);
        }
 
        /**
         * Search for a variable in the stack
         *
-        * @param       $var    The variable we are looking for
-        * @return      $idx    FALSE means not found, >=0 means found on a specific index
+        * @param       $variableName   The variable we are looking for
+        * @param       $variableGroup  Optional variable group to look in
+        * @return      $index                  FALSE means not found, >=0 means found on a specific index
         */
-       private function isVariableAlreadySet ($var) {
+       private function getVariableIndex ($variableName, $variableGroup = NULL) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
                // First everything is not found
-               $found = false;
+               $found = FALSE;
+
+               // If the stack is NULL, use the current group
+               if (is_null($variableGroup)) {
+                       // Use current group
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.' currGroup=' . $this->currGroup . ' set as stack!');
+                       $variableGroup = $this->currGroup;
+               } // END - if
 
                // Is the group there?
-               if (isset($this->varStack[$this->currGroup])) {
+               if ($this->isVarStackSet($variableGroup)) {
                        // Now search for it
-                       foreach ($this->varStack[$this->currGroup] as $idx => $currEntry) {
-                               //* DEBUG: */ echo __METHOD__.":currGroup={$this->currGroup},idx={$idx},currEntry={$currEntry['name']},var={$var}<br />\n";
+                       foreach ($this->getVarStack($variableGroup) as $index => $currEntry) {
+                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.':currGroup=' . $variableGroup . ',idx=' . $index . ',currEntry=' . $currEntry['name'] . ',variableName=' . $variableName);
                                // Is the entry found?
-                               if ($currEntry['name'] == $var) {
+                               if ($currEntry['name'] == $variableName) {
                                        // Found!
-                                       //* DEBUG: */ echo __METHOD__.":FOUND!<br />\n";
-                                       $found = $idx;
+                                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.':FOUND!');
+                                       $found = $index;
                                        break;
                                } // END - if
                        } // END - foreach
@@ -176,59 +209,104 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                return $found;
        }
 
+       /**
+        * Checks whether the given variable group is set
+        *
+        * @param       $variableGroup  Variable group to check
+        * @return      $isSet                  Whether the given variable group is set
+        */
+       protected final function isVarStackSet ($variableGroup) {
+               // Check it
+               $isSet = isset($this->varStack[$variableGroup]);
+
+               // Return result
+               return $isSet;
+       }
+
+       /**
+        * Getter for given variable group
+        *
+        * @param       $variableGroup  Variable group to check
+        * @return      $varStack               Found variable group
+        */
+       public final function getVarStack ($variableGroup) {
+               return $this->varStack[$variableGroup];
+       }
+
+       /**
+        * Setter for given variable group
+        *
+        * @param       $variableGroup  Variable group to check
+        * @param       $varStack               Variable stack to check
+        * @return      void
+        */
+       protected final function setVarStack ($variableGroup, array $varStack) {
+               $this->varStack[$variableGroup]  = $varStack;
+       }
+
        /**
         * Return a content of a variable or null if not found
         *
-        * @param       $var            The variable we are looking for
-        * @return      $content        Content of the variable or null if not found
+        * @param       $variableName   The variable we are looking for
+        * @param       $variableGroup  Optional variable group to look in
+        * @return      $content                Content of the variable or null if not found
         */
-       protected function readVariable ($var) {
+       protected function readVariable ($variableName, $variableGroup = NULL) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
                // First everything is not found
-               $content = null;
+               $content = NULL;
+
+               // If the stack is NULL, use the current group
+               if (is_null($variableGroup)) {
+                       // Use current group
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.' currGroup=' . $this->currGroup . ' set as stack!');
+                       $variableGroup = $this->currGroup;
+               } // END - if
 
                // Get variable index
-               $found = $this->isVariableAlreadySet($var);
+               $found = $this->getVariableIndex($variableName, $variableGroup);
 
                // Is the variable found?
-               if ($found !== false) {
+               if ($found !== FALSE) {
                        // Read it
-                       $found = $this->varStack[$this->currGroup][$found]['value'];
+                       $content = $this->getVariableValue($variableGroup, $found);
                } // END - if
 
-               //* DEBUG: */ echo __METHOD__.": group=".$this->currGroup.",var=".$var.", found=".$found."<br />\n";
-
                // Return the current position
-               return $found;
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.': variableGroup=' . $variableGroup . ',variableName=' . $variableName . ', content[' . gettype($content) . ']=' . $content);
+               return $content;
        }
 
        /**
         * Add a variable to the stack
         *
-        * @param       $var    The variable we are looking for
-        * @param       $value  The value we want to store in the variable
+        * @param       $variableName   Name of variable to add
+        * @param       $value                  Value we want to store in the variable
         * @return      void
         */
-       private function addVariable ($var, $value) {
+       private function addVariable ($variableName, $value) {
                // Set general variable group
                $this->setVariableGroup('general');
 
                // Add it to the stack
-               $this->addGroupVariable($var, $value);
+               $this->addGroupVariable($variableName, $value);
        }
 
        /**
         * Returns all variables of current group or empty array
         *
-        * @return      $result         Wether array of found variables or empty array
+        * @return      $result         Whether array of found variables or empty array
         */
        private function readCurrentGroup () {
                // Default is not found
                $result = array();
 
                // Is the group there?
-               if (isset($this->varStack[$this->currGroup])) {
+               if ($this->isVarStackSet($this->currGroup)) {
                        // Then use it
-                       $result = $this->varStack[$this->currGroup];
+                       $result = $this->getVarStack($this->currGroup);
                } // END - if
 
                // Return result
@@ -239,16 +317,16 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * Settter for variable group
         *
         * @param       $groupName      Name of variable group
-        * @param       $add            Wether add this group
-        * @retur4n     void
+        * @param       $add            Whether add this group
+        * @retur     void
         */
-       public function setVariableGroup ($groupName, $add = true) {
+       public function setVariableGroup ($groupName, $add = TRUE) {
                // Set group name
-               //* DEBIG: */ echo __METHOD__.": currGroup=".$groupName."<br />\n";
+               //* DEBIG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.': currGroup=' . $groupName);
                $this->currGroup = $groupName;
 
                // Skip group 'general'
-               if (($groupName != 'general') && ($add === true)) {
+               if (($groupName != 'general') && ($add === TRUE)) {
                        $this->varGroups[$groupName] = 'OK';
                } // END - if
        }
@@ -257,42 +335,129 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        /**
         * Adds a variable to current group
         *
-        * @param       $var    Variable to set
-        * @param       $value  Value to store in variable
+        * @param       $variableName   Variable to set
+        * @param       $value                  Value to store in variable
         * @return      void
         */
-       public function addGroupVariable ($var, $value) {
-               //* DEBUG: */ echo __METHOD__.": group=".$this->currGroup.", var=".$var.", value=".$value."<br />\n";
+       public function addGroupVariable ($variableName, $value) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
+               // Debug message
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.': group=' . $this->currGroup . ', variableName=' . $variableName . ', value=' . $value);
 
                // Get current variables in group
                $currVars = $this->readCurrentGroup();
 
                // Append our variable
-               $currVars[] = array(
-                       'name'  => $var,
-                       'value' => $value
-               );
+               array_push($currVars, $this->generateVariableArray($variableName, $value));
 
                // Add it to the stack
-               $this->varStack[$this->currGroup] = $currVars;
+               $this->setVarStack($this->currGroup, $currVars);
+       }
+
+       /**
+        * Getter for variable value, throws a NoVariableException if the variable is not found
+        *
+        * @param       $varGroup       Variable group to use
+        * @param       $index          Index in variable array
+        * @return      $value          Value to set
+        */
+       private function getVariableValue ($varGroup, $index) {
+               // Return it
+               return $this->varStack[$varGroup][$index]['value'];
        }
 
        /**
         * Modify an entry on the stack
         *
-        * @param       $var    The variable we are looking for
-        * @param       $value  The value we want to store in the variable
+        * @param       $variableName   The variable we are looking for
+        * @param       $value                  The value we want to store in the variable
         * @return      void
+        * @throws      NoVariableException     If the given variable is not found
         */
-       private function modifyVariable ($var, $value) {
+       private function modifyVariable ($variableName, $value) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
                // Get index for variable
-               $idx = $this->isVariableAlreadySet($var);
+               $index = $this->getVariableIndex($variableName);
 
                // Is the variable set?
-               if ($idx !== false) {
-                       // Then modify it
-                       $this->varStack[$this->currGroup][$idx]['value'] = $value;
+               if ($index === FALSE) {
+                       // Unset variables cannot be modified
+                       throw new NoVariableException(array($this, $variableName, $value), self::EXCEPTION_VARIABLE_IS_MISSING);
                } // END - if
+
+               // Then modify it
+               $this->setVariableValue($this->currGroup, $index, $value);
+       }
+
+       /**
+        * Sets a variable value for given variable group and index
+        *
+        * @param       $varGroup       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;
+       }
+
+       /**
+        * Sets a variable within given group. This method does detect if the
+        * variable is already set. If so, the variable got modified, otherwise
+        * added.
+        *
+        * @param       $varGroup               Variable group to use
+        * @param       $variableName   Variable to set
+        * @param       $value                  Value to set
+        * @return      void
+        */
+       protected function setVariable ($varGroup, $variableName, $value) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
+               // Get index for variable
+               $index = $this->getVariableIndex($variableName);
+
+               // Is the variable set?
+               if ($index === FALSE) {
+                       // Is the stack there?
+                       if (!isset($this->varStack[$varGroup])) {
+                               // Then initialize it here
+                               $this->varStack[$varGroup] = array();
+                       } // END - if
+
+                       // Not found, add it
+                       array_push($this->varStack[$varGroup], $this->generateVariableArray($variableName, $value));
+               } else {
+                       // Then modify it
+                       $this->setVariableValue($this->currGroup, $index, $value);
+               }
+       }
+
+       /**
+        * "Generates" (better returns) an array for all variables for given
+        * variable/value pay.
+        *
+        * @param       $variableName   Variable to set
+        * @param       $value                  Value to set
+        * @return      $varData                Variable data array
+        */
+       private function generateVariableArray ($variableName, $value) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
+               // Generate the temporary array
+               $varData = array(
+                       'name'  => $variableName,
+                       'value' => $value
+               );
+
+               // And return it
+               return $varData;
        }
 
        /**
@@ -306,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
         *
@@ -415,62 +589,27 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        }
 
        /**
-        * Getter for template type
-        *
-        * @return      $templateType   The current template's type
-        */
-       public final function getTemplateType () {
-               return $this->templateType;
-       }
-
-       /**
-        * Assign (add) a given variable with a value
+        * Unsets the given offset in the variable group
         *
-        * @param       $var    The variable we are looking for
-        * @param       $value  The value we want to store in the variable
+        * @param       $index                  Index to unset
+        * @param       $variableGroup  Variable group (default: currGroup)
         * @return      void
-        * @throws      EmptyVariableException  If the variable name is left empty
         */
-       public final function assignVariable ($var, $value) {
-               // Trim spaces of variable name
-               $var = trim($var);
-
-               // Empty variable found?
-               if (empty($var)) {
-                       // Throw an exception
-                       throw new EmptyVariableException(array($this, 'var'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+       protected final function unsetVariableStackOffset ($index, $variableGroup = NULL) {
+               // Is the variable group not set?
+               if (is_null($variableGroup)) {
+                       // Then set it to current
+                       $variableGroup = $this->currGroup;
                } // END - if
 
-               // First search for the variable if it was already added
-               $idx = $this->isVariableAlreadySet($var);
-
-               // Was it found?
-               if ($idx === false) {
-                       // Add it to the stack
-                       //* DEBUG: */ echo "ADD: ".$var."<br />\n";
-                       $this->addVariable($var, $value);
-               } elseif (!empty($value)) {
-                       // Modify the stack entry
-                       //* DEBUG: */ echo "MOD: ".$var."<br />\n";
-                       $this->modifyVariable($var, $value);
-               }
-       }
-
-       /**
-        * Removes a given variable
-        *
-        * @param       $var    The variable we are looking for
-        * @return      void
-        */
-       public final function removeVariable ($var) {
-               // First search for the variable if it was already added
-               $idx = $this->isVariableAlreadySet($var);
+               // Is the entry there?
+               if (!isset($this->varStack[$variableGroup][$index])) {
+                       // Abort here, we need fixing!
+                       $this->debugInstance();
+               } // END - if
 
-               // Was it found?
-               if ($idx !== false) {
-                       // Remove this variable
-                       $this->varStack->offsetUnset($idx);
-               }
+               // Remove it
+               unset($this->varStack[$variableGroup][$index]);
        }
 
        /**
@@ -481,8 +620,8 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         */
        protected final function setRawTemplateData ($rawTemplateData) {
                // And store it in this class
-               //* DEBUG: */ echo __METHOD__.':'.$this->getUniqueId().': '.strlen($rawTemplateData).' Bytes set.<br />\n';
-               //* DEBUG: */ echo $this->currGroup.' variables: '.count($this->varStack[$this->currGroup]).', groups='.count($this->varStack).'<br />\n';
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.': ' . strlen($rawTemplateData) . ' Bytes set.');
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.': ' . $this->currGroup . ' variables: ' . count($this->getVarStack($this->currGroup)) . ', groups=' . count($this->varStack));
                $this->rawTemplateData = (string) $rawTemplateData;
        }
 
@@ -492,7 +631,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      $rawTemplateData        The raw data from the template
         */
        public final function getRawTemplateData () {
-               //* DEBUG: */ echo __METHOD__.':'.$this->getUniqueId().': '.strlen($this->rawTemplateData).' Bytes read.<br />\n';
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: ' . strlen($this->rawTemplateData) . ' Bytes read.');
                return $this->rawTemplateData;
        }
 
@@ -503,7 +642,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         */
        private final function setCompiledData ($compiledData) {
                // And store it in this class
-               //* DEBUG: */ echo __METHOD__.':'.$this->getUniqueId().': '.strlen($compiledData).' Bytes set.<br />\n';
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: ' . strlen($compiledData) . ' Bytes set.');
                $this->compiledData = (string) $compiledData;
        }
 
@@ -513,7 +652,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      $compiledData   Compiled template data
         */
        public final function getCompiledData () {
-               //* DEBUG: */ echo __METHOD__.':'.$this->getUniqueId().': '.strlen($this->compiledData).' Bytes read.<br />\n';
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: ' . strlen($this->compiledData) . ' Bytes read.');
                return $this->compiledData;
        }
 
@@ -523,7 +662,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @param       $template       The template we shall load
         * @param       $extOther       An other extension to use
         * @return      void
-        * @throws      FileNotFoundException   If the template was not found
+        * @throws      FileIoException If the template was not found
         */
        protected function loadTemplate ($template, $extOther = '') {
                // Get extension for the template if empty
@@ -535,22 +674,35 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        $ext = (string) $extOther;
                }
 
-               // Construct the FQFN for the template by honoring the current language
-               $fqfn = sprintf("%s%s%s%s/%s/%s%s",
-                       $this->getConfigInstance()->getConfigEntry('base_path'),
-                       $this->getTemplateBasePath(),
-                       $this->getGenericBasePath(),
-                       $this->getLanguageInstance()->getLanguageCode(),
-                       $this->getTemplateType(),
-                       (string) $template,
-                       $ext
-               );
+               // Is language support enabled?
+               if ($this->isLanguageSupportEnabled()) {
+                       // Construct the FQFN for the template by honoring the current language
+                       $fqfn = sprintf('%s%s%s%s/%s/%s%s',
+                               $this->getConfigInstance()->getConfigEntry('base_path'),
+                               $this->getTemplateBasePath(),
+                               $this->getGenericBasePath(),
+                               $this->getLanguageInstance()->getLanguageCode(),
+                               $this->getTemplateType(),
+                               (string) $template,
+                               $ext
+                       );
+               } else {
+                       // Construct the FQFN for the template without language
+                       $fqfn = sprintf('%s%s%s%s/%s%s',
+                               $this->getConfigInstance()->getConfigEntry('base_path'),
+                               $this->getTemplateBasePath(),
+                               $this->getGenericBasePath(),
+                               $this->getTemplateType(),
+                               (string) $template,
+                               $ext
+                       );
+               }
 
                // First try this
                try {
                        // Load the raw template data
                        $this->loadRawTemplateData($fqfn);
-               } catch (FileNotFoundException $e) {
+               } catch (FileIoException $e) {
                        // If we shall load a code-template we need to switch the file extension
                        if (($this->getTemplateType() != $this->getConfigInstance()->getConfigEntry('web_template_type')) && (empty($extOther))) {
                                // Switch over to the code-template extension and try it again
@@ -560,7 +712,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                                $this->loadTemplate($template, $ext);
                        } else {
                                // Throw it again
-                               throw new FileNotFoundException($fqfn, FrameworkFileInputPointer::EXCEPTION_FILE_NOT_FOUND);
+                               throw new FileIoException($fqfn, FrameworkFileInputPointer::EXCEPTION_FILE_NOT_FOUND);
                        }
                }
 
@@ -573,14 +725,11 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      void
         */
        private function loadRawTemplateData ($fqfn) {
-               // Get a input/output instance from the middleware
-               $ioInstance = $this->getFileIoInstance();
-
                // Some debug code to look on the file which is being loaded
-               //* DEBUG: */ echo __METHOD__.": FQFN=".$fqfn."<br />\n";
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: FQFN=' . $fqfn);
 
                // Load the raw template
-               $rawTemplateData = $ioInstance->loadFileContents($fqfn);
+               $rawTemplateData = $this->getFileIoInstance()->loadFileContents($fqfn);
 
                // Store the template's contents into this class
                $this->setRawTemplateData($rawTemplateData);
@@ -593,18 +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 orconfig) by
-        *                                              default
-        * @param       $var            The variable we want to assign
+        * @param       $varName                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) {
+               // 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);
+
                // Is it not a config variable?
                if ($varName != 'config') {
                        // Regular template variables
-                       $this->assignVariable($var, '');
+                       $this->assignVariable($variableName, '');
                } else {
                        // Configuration variables
-                       $this->assignConfigVariable($var);
+                       $this->assignConfigVariable($variableName);
                }
        }
 
@@ -619,7 +775,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $rawData = (string) $rawData;
 
                // Search for variables
-               @preg_match_all('/\$(\w+)(\[(\w+)\])?/', $rawData, $variableMatches);
+               preg_match_all('/\$(\w+)(\[(\w+)\])?/', $rawData, $variableMatches);
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:rawData(' . strlen($rawData) . ')=' . $rawData . ',variableMatches=' . print_r($variableMatches, TRUE));
 
                // Did we find some variables?
                if ((is_array($variableMatches)) && (count($variableMatches) == 4) && (count($variableMatches[0]) > 0)) {
@@ -656,29 +815,33 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $backup = $this->getRawTemplateData();
 
                // Initialize some arrays
-               if (is_null($this->loadedRawData)) { $this->loadedRawData = array(); $this->rawTemplates = array(); }
+               if (is_null($this->loadedRawData)) {
+                       // Initialize both
+                       $this->loadedRawData = array();
+                       $this->rawTemplates = array();
+               } // END - if
 
                // Load all requested templates
                foreach ($templateMatches[1] as $template) {
-
                        // Load and compile only templates which we have not yet loaded
                        // RECURSIVE PROTECTION! BE CAREFUL HERE!
                        if ((!isset($this->loadedRawData[$template])) && (!in_array($template, $this->loadedTemplates))) {
+                               // Debug message
+                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:template=' . $template);
 
                                // Template not found, but maybe variable assigned?
-                               //* DEBUG: */ echo __METHOD__.":template={$template}<br />\n";
-                               if ($this->isVariableAlreadySet($template) !== false) {
+                               if ($this->getVariableIndex($template, 'config') !== FALSE) {
                                        // Use that content here
-                                       $this->loadedRawData[$template] = $this->readVariable($template);
+                                       $this->loadedRawData[$template] = $this->readVariable($template, 'config');
 
                                        // Recursive protection:
-                                       $this->loadedTemplates[] = $template;
-                               } elseif (isset($this->varStack['config'][$template])) {
+                                       array_push($this->loadedTemplates, $template);
+                               } elseif ($this->getVariableIndex($template) !== FALSE) {
                                        // Use that content here
-                                       $this->loadedRawData[$template] = $this->varStack['config'][$template];
+                                       $this->loadedRawData[$template] = $this->readVariable($template);
 
                                        // Recursive protection:
-                                       $this->loadedTemplates[] = $template;
+                                       array_push($this->loadedTemplates, $template);
                                } else {
                                        // Then try to search for code-templates
                                        try {
@@ -688,13 +851,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
                                                // Remember this template for recursion detection
                                                // RECURSIVE PROTECTION!
-                                               $this->loadedTemplates[] = $template;
-                                       } catch (FileNotFoundException $e) {
-                                               // Even this is not done... :/
-                                               $this->rawTemplates[] = $template;
-                                       } catch (FilePointerNotOpenedException $e) {
+                                               array_push($this->loadedTemplates, $template);
+                                       } catch (FileIoException $e) {
                                                // Even this is not done... :/
-                                               $this->rawTemplates[] = $template;
+                                               array_push($this->rawTemplates, $template);
                                        }
                                }
                        } // END - if
@@ -719,7 +879,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                } // END - if
 
                // Remember this template being compiled
-               $this->compiledTemplates[] = $template;
+               array_push($this->compiledTemplates, $template);
 
                // Compile the loaded code in five steps:
                //
@@ -754,7 +914,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        $foundIndex = array_search($template, $templateMatches[1]);
 
                        // Lookup the matching template replacement
-                       if (($foundIndex !== false) && (isset($templateMatches[0][$foundIndex]))) {
+                       if (($foundIndex !== FALSE) && (isset($templateMatches[0][$foundIndex]))) {
 
                                // Get the current raw template
                                $rawData = $this->getRawTemplateData();
@@ -790,11 +950,8 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
                                        // Remember this template for recursion detection
                                        // RECURSIVE PROTECTION!
-                                       $this->loadedTemplates[] = $template;
-                               } catch (FileNotFoundException $e) {
-                                       // This template was never found. We silently ignore it
-                                       unset($this->rawTemplates[$key]);
-                               } catch (FilePointerNotOpenedException $e) {
+                                       array_push($this->loadedTemplates, $template);
+                               } catch (FileIoException $e) {
                                        // This template was never found. We silently ignore it
                                        unset($this->rawTemplates[$key]);
                                }
@@ -810,8 +967,16 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @todo        Unfinished work or don't die here.
         */
        private function assignAllVariables (array $varMatches) {
+               // Debug message
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:varMatches()=' . count($varMatches));
+
                // Search for all variables
                foreach ($varMatches[1] as $key => $var) {
+                       // Replace all dashes to underscores to match variables with configuration entries
+                       $var = trim($this->convertDashesToUnderscores($var));
+
+                       // Debug message
+                       self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:key=' . $key . ',var=' . $var);
 
                        // Detect leading equals
                        if (substr($varMatches[2][$key], 0, 1) == '=') {
@@ -820,16 +985,16 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        } // END - if
 
                        // Do we have some quotes left and right side? Then it is free text
-                       if ((substr($varMatches[2][$key], 0, 1) == "\"") && (substr($varMatches[2][$key], -1, 1) == "\"")) {
+                       if ((substr($varMatches[2][$key], 0, 1) == '"') && (substr($varMatches[2][$key], -1, 1) == '"')) {
                                // Free string detected! Which we can assign directly
                                $this->assignVariable($var, $varMatches[3][$key]);
                        } elseif (!empty($varMatches[2][$key])) {
                                // @TODO Non-string found so we need some deeper analysis...
-                               ApplicationEntryPoint::app_die('Deeper analysis not yet implemented!');
+                               ApplicationEntryPoint::app_exit('Deeper analysis not yet implemented!');
                        }
-
-               } // for ($varMatches ...
+               } // END - foreach
        }
+
        /**
         * Compiles all loaded raw templates
         *
@@ -837,40 +1002,42 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      void
         */
        private function compileRawTemplateData (array $templateMatches) {
+               // Debug message
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:loadedRawData()= ' .count($this->loadedRawData));
+
                // Are some code-templates found which we need to compile?
                if (count($this->loadedRawData) > 0) {
-
                        // Then compile all!
                        foreach ($this->loadedRawData as $template => $code) {
+                               // Debug message
+                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:template=' . $template . ',code(' . strlen($code) . ')=' . $code);
 
                                // Is this template already compiled?
                                if (in_array($template, $this->compiledTemplates)) {
                                        // Then skip it
+                                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: Template ' . $template . ' already compiled. SKIPPED!');
                                        continue;
-                               }
+                               } // END - if
 
                                // Search for the template
                                $foundIndex = array_search($template, $templateMatches[1]);
 
                                // Lookup the matching variable data
-                               if (($foundIndex !== false) && (isset($templateMatches[3][$foundIndex]))) {
-
+                               if (($foundIndex !== FALSE) && (isset($templateMatches[3][$foundIndex]))) {
                                        // Split it up with another reg. exp. into variable=value pairs
                                        preg_match_all($this->regExpVarValue, $templateMatches[3][$foundIndex], $varMatches);
+                                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:varMatches=' . print_r($varMatches, TRUE));
 
                                        // Assign all variables
                                        $this->assignAllVariables($varMatches);
-
                                } // END - if (isset($templateMatches ...
 
                                // Compile the loaded template
                                $this->compileCode($code, $template);
-
                        } // END - foreach ($this->loadedRawData ...
 
                        // Insert all templates
                        $this->insertAllTemplates($templateMatches);
-
                } // END - if (count($this->loadedRawData) ...
        }
 
@@ -895,23 +1062,30 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        private function finalizeVariableCompilation () {
                // Get the content
                $content = $this->getRawTemplateData();
-               //* DEBUG: */ echo __METHOD__.': content before='.strlen($content).' ('.md5($content).')<br />\n';
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: content before=' . strlen($content) . ' (' . md5($content) . ')');
+
+               // Do we have the stack?
+               if (!$this->isVarStackSet('general')) {
+                       // Abort here silently
+                       // @TODO This silent abort should be logged, maybe.
+                       return;
+               } // END - if
 
                // Walk through all variables
-               foreach ($this->varStack['general'] as $currEntry) {
-                       //* DEBUG: */ echo __METHOD__.': name='.$currEntry['name'].', value=<pre>'.htmlentities($currEntry['value']).'</pre>\n';
+               foreach ($this->getVarStack('general') as $currEntry) {
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: name=' . $currEntry['name'] . ', value=<pre>' . htmlentities($currEntry['value']) . '</pre>');
                        // Replace all [$var] or {?$var?} with the content
                        // @TODO Old behaviour, will become obsolete!
-                       $content = str_replace("\$content[".$currEntry['name'].']', $currEntry['value'], $content);
+                       $content = str_replace('$content[' . $currEntry['name'] . ']', $currEntry['value'], $content);
 
                        // @TODO Yet another old way
-                       $content = str_replace('['.$currEntry['name'].']', $currEntry['value'], $content);
+                       $content = str_replace('[' . $currEntry['name'] . ']', $currEntry['value'], $content);
 
                        // The new behaviour
-                       $content = str_replace('{?'.$currEntry['name'].'?}', $currEntry['value'], $content);
+                       $content = str_replace('{?' . $currEntry['name'] . '?}', $currEntry['value'], $content);
                } // END - for
 
-               //* DEBUG: */ echo __METHOD__.': content after='.strlen($content).' ('.md5($content).')<br />\n';
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: content after=' . strlen($content) . ' (' . md5($content) . ')');
 
                // Set the content back
                $this->setRawTemplateData($content);
@@ -932,33 +1106,127 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $this->loadTemplate($template);
        }
 
+       /**
+        * Assign (add) a given variable with a value
+        *
+        * @param       $variableName   The variable we are looking for
+        * @param       $value                  The value we want to store in the variable
+        * @return      void
+        * @throws      EmptyVariableException  If the variable name is left empty
+        */
+       public final function assignVariable ($variableName, $value) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
+               // Empty variable found?
+               if (empty($variableName)) {
+                       // Throw an exception
+                       throw new EmptyVariableException(array($this, 'variableName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+               } // END - if
+
+               // First search for the variable if it was already added
+               $index = $this->getVariableIndex($variableName);
+
+               // Was it found?
+               if ($index === FALSE) {
+                       // Add it to the stack
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:ADD: ' . $variableName . '[' . gettype($value) . ']=' . $value);
+                       $this->addVariable($variableName, $value);
+               } elseif (!empty($value)) {
+                       // Modify the stack entry
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:MOD: ' . $variableName . '[' . gettype($value) . ']=' . $value);
+                       $this->modifyVariable($variableName, $value);
+               }
+       }
+
+       /**
+        * Removes a given variable
+        *
+        * @param       $variableName   The variable we are looking for
+        * @param       $variableGroup  Name of variable group (default: 'general')
+        * @return      void
+        */
+       public final function removeVariable ($variableName, $variableGroup = 'general') {
+               // First search for the variable if it was already added
+               $index = $this->getVariableIndex($variableName, $variableGroup);
+
+               // Was it found?
+               if ($index !== FALSE) {
+                       // Remove this variable
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:UNSET: variableGroup=' . $variableGroup . ',variableName=' . $variableName . ',index=' . $index);
+                       $this->unsetVariableStackOffset($index, $variableGroup);
+               } // END - if
+       }
+
+       /**
+        * Assigns the last loaded raw template content with a given variable
+        *
+        * @param       $templateName   Name of the template we want to assign
+        * @param       $variableName   Name of the variable we want to assign
+        * @return      void
+        */
+       public function assignTemplateWithVariable ($templateName, $variableName) {
+               // Get the content from last loaded raw template
+               $content = $this->getRawTemplateData();
+
+               // Assign the variable
+               $this->assignVariable($variableName, $content);
+
+               // Purge raw content
+               $this->setRawTemplateData('');
+       }
+
        /**
         * Assign a given congfiguration variable with a value
         *
-        * @param       $var    The configuration variable we want to assign
+        * @param       $variableName   The configuration variable we want to assign
         * @return      void
         */
-       public function assignConfigVariable ($var) {
+       public function assignConfigVariable ($variableName) {
+               // Replace all dashes to underscores to match variables with configuration entries
+               $variableName = trim($this->convertDashesToUnderscores($variableName));
+
                // Sweet and simple...
-               //* DEBUG: */ echo __METHOD__.':var={$var}<br />\n';
-               $this->varStack['config'][$var] = $this->getConfigInstance()->getConfigEntry($var);
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: variableName=' . $variableName . ',getConfigEntry()=' . $this->getConfigInstance()->getConfigEntry($variableName));
+               $this->setVariable('config', $variableName, $this->getConfigInstance()->getConfigEntry($variableName));
        }
 
        /**
-        * Load a specified email template into the engine
+        * Injects an array of config variables into the stack of currently loaded
+        * template. This method should only be used in very rare circumstances,
+        * e.g. when you have to copy a whole set of variables into the template
+        * engine. Before you use this method, please make sure you have considered
+        * all other possiblities.
         *
-        * @param       $template       The email template we shall load which is located in
-        *                                              'emails' by default
+        * @param       $variables      An array with variables to be injected
         * @return      void
-        * @deprecated
-        * @see         See loadCodeTemplate()
         */
-       public function loadEmailTemplate ($template) {
-               // Set template type
-               $this->setTemplateType($this->getConfigInstance()->getConfigEntry('email_template_type'));
+       public function injectConfigVariables (array $variables) {
+               // "Inject" all
+               foreach ($variables as $name => $value) {
+                       // Set variable with name for 'config' group
+                       $this->setVariable('config', $name, $value);
+               } // END - foreach
+       }
 
-               // Load the special template
-               $this->loadTemplate($template);
+       /**
+        * Assigns all the application data with template variables
+        *
+        * @param       $applicationInstance    A manageable application instance
+        * @return      void
+        */
+       public function assignApplicationData (ManageableApplication $applicationInstance) {
+               // Get long name and assign it
+               $this->assignVariable('app_full_name' , $applicationInstance->getAppName());
+
+               // Get short name and assign it
+               $this->assignVariable('app_short_name', $applicationInstance->getAppShortName());
+
+               // Get version number and assign it
+               $this->assignVariable('app_version'   , $applicationInstance->getAppVersion());
+
+               // Assign extra application-depending data
+               $applicationInstance->assignExtraTemplateData($this);
        }
 
        /**
@@ -976,6 +1244,44 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $this->loadTemplate($template);
        }
 
+       /**
+        * Compiles configuration place-holders in all variables. This 'walks'
+        * through the variable group 'general'. It interprets all values from that
+        * variables as configuration entries after compiling them.
+        *
+        * @return      void
+        */
+       public final function compileConfigInVariables () {
+               // Do we have the stack?
+               if (!$this->isVarStackSet('general')) {
+                       // Abort here silently
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: Aborted, variable stack general not found!');
+                       return;
+               } // END - if
+
+               // Iterate through all general variables
+               foreach ($this->getVarStack('general') as $index => $currVariable) {
+                       // Compile the value
+                       $value = $this->compileRawCode($this->readVariable($currVariable['name']), TRUE);
+
+                       // Debug message
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: name=' . $currVariable['name'] . ',value=' . $value);
+
+                       // Remove it from stack
+                       $this->removeVariable($currVariable['name'], 'general');
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: value='. $value . ',name=' . $currVariable['name'] . ',index=' . $index);
+
+                       // Is it a configuration key?
+                       if ($this->getConfigInstance()->isConfigurationEntrySet($value)) {
+                               // The value itself is a configuration entry
+                               $this->assignConfigVariable($value);
+                       } else {
+                               // Re-assign the value directly
+                               $this->setVariable('config', $currVariable['name'], $value);
+                       }
+               } // END - foreach
+       }
+
        /**
         * Compile all variables by inserting their respective values
         *
@@ -988,23 +1294,17 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $dummy = array();
 
                // Iterate through all general variables
-               foreach ($this->varStack['general'] as $currVariable) {
+               foreach ($this->getVarStack('general') as $currVariable) {
                        // Transfer it's name/value combination to the $content array
-                       //* DEBUG: */ echo $currVariable['name'].'=<pre>'.htmlentities($currVariable['value']).'</pre>\n';
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:' . $currVariable['name'] . '=<pre>' . htmlentities($currVariable['value']).'</pre>');
                        $dummy[$currVariable['name']] = $currVariable['value'];
                }// END - if
 
                // Set the new variable (don't remove the second dollar!)
                $$validVar = $dummy;
 
-               // Prepare all configuration variables
-               $config = null;
-               if (isset($this->varStack['config'])) {
-                       $config = $this->varStack['config'];
-               } // END - if
-
                // Remove some variables
-               unset($idx);
+               unset($index);
                unset($currVariable);
 
                // Run the compilation three times to get content from helper classes in
@@ -1014,12 +1314,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        $this->finalizeVariableCompilation();
 
                        // Prepare the eval() command for comiling the template
-                       $eval = sprintf("\$result = \"%s\";",
+                       $eval = sprintf('$result = "%s";',
                                addslashes($this->getRawTemplateData())
                        );
 
                        // This loop does remove the backslashes (\) in PHP parameters
-                       while (strpos($eval, $this->codeBegin) !== false) {
+                       while (strpos($eval, $this->codeBegin) !== FALSE) {
                                // Get left part before "<?"
                                $evalLeft = substr($eval, 0, strpos($eval, $this->codeBegin));
 
@@ -1034,14 +1334,14 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                                $evalRight = substr($evalRight, (strpos($evalRight, $this->codeEnd) + 2));
 
                                // And put all together
-                               $eval = sprintf("%s<%%php %s %%>%s", $evalLeft, $evalMiddle, $evalRight);
+                               $eval = sprintf('%s<%%php %s %%>%s', $evalLeft, $evalMiddle, $evalRight);
                        } // END - while
 
                        // Prepare PHP code for eval() command
                        $eval = str_replace(
-                               "<%php", "\";",
+                               '<%php', '";',
                                str_replace(
-                                       "%>",
+                                       '%>',
                                        "\n\$result .= \"",
                                        $eval
                                )
@@ -1053,7 +1353,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        // Goes something wrong?
                        if ((!isset($result)) || (empty($result))) {
                                // Output eval command
-                               $this->debugOutput(sprintf("Failed eval() code: <pre>%s</pre>", $this->markupCode($eval, true)), true);
+                               self::createDebugInstance(__CLASS__)->debugOutput(sprintf('Failed eval() code: <pre>%s</pre>', $this->markupCode($eval, TRUE)), TRUE);
 
                                // Output backtrace here
                                $this->debugBackTrace();
@@ -1081,8 +1381,11 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         *                                                                                      count has been found
         */
        public function compileTemplate () {
+               // Get code type to make things shorter
+               $codeType = $this->getConfigInstance()->getConfigEntry('code_template_type');
+
                // We will only work with template type "code" from configuration
-               if ($this->getTemplateType() != $this->getConfigInstance()->getConfigEntry('code_template_type')) {
+               if (substr($this->getTemplateType(), 0, strlen($codeType)) != $codeType) {
                        // Abort here
                        throw new UnexpectedTemplateTypeException(array($this, $this->getTemplateType(), $this->getConfigInstance()->getConfigEntry('code_template_type')), self::EXCEPTION_TEMPLATE_TYPE_IS_UNEXPECTED);
                } // END - if
@@ -1099,6 +1402,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                // Search for code-tags which are {? ?}
                preg_match_all($this->regExpCodeTags, $rawData, $templateMatches);
 
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:templateMatches=' . print_r($templateMatches , TRUE));
+
                // Analyze the matches array
                if ((is_array($templateMatches)) && (count($templateMatches) == 4) && (count($templateMatches[0]) > 0)) {
                        // Entries are found:
@@ -1114,47 +1420,15 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
                        // Are some raw templates found and loaded?
                        if (count($this->rawTemplates) > 0) {
-
                                // Insert all raw templates
                                $this->insertRawTemplates();
 
                                // Remove the raw template content as well
                                $this->setRawTemplateData('');
-
                        } // END - if
-
                } // END - if($templateMatches ...
        }
 
-       /**
-        * A old deprecated method
-        *
-        * @return      void
-        * @deprecated
-        * @see         BaseTemplateEngine::transferToResponse
-        */
-       public function output () {
-               // Check which type of template we have
-               switch ($this->getTemplateType()) {
-                       case 'html': // Raw HTML templates can be send to the output buffer
-                               // Quick-N-Dirty:
-                               $this->getWebOutputInstance()->output($this->getCompiledData());
-                               break;
-
-                       default: // Unknown type found
-                               // Construct message
-                               $msg = sprintf("[%s-&gt;%s] Unknown/unsupported template type <span class=\"data\">%s</span> detected.",
-                                       $this->__toString(),
-                                       __FUNCTION__,
-                                       $this->getTemplateType()
-                               );
-
-                               // Write the problem to the world...
-                               $this->debugOutput($msg);
-                               break;
-               } // END - switch
-       }
-
        /**
         * Loads a given view helper (by name)
         *
@@ -1162,13 +1436,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      void
         */
        protected function loadViewHelper ($helperName) {
-               // Make first character upper case, rest low
-               $helperName = $this->convertToClassName($helperName);
-
                // Is this view helper loaded?
                if (!isset($this->helpers[$helperName])) {
                        // Create a class name
-                       $className = "{$helperName}ViewHelper";
+                       $className = $this->convertToClassName($helperName) . 'ViewHelper';
 
                        // Generate new instance
                        $this->helpers[$helperName] = ObjectFactory::createObjectByName($className);
@@ -1178,24 +1449,6 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                return $this->helpers[$helperName];
        }
 
-       /**
-        * Assigns the last loaded raw template content with a given variable
-        *
-        * @param       $templateName   Name of the template we want to assign
-        * @param       $variableName   Name of the variable we want to assign
-        * @return      void
-        */
-       public function assignTemplateWithVariable ($templateName, $variableName) {
-               // Get the content from last loaded raw template
-               $content = $this->getRawTemplateData();
-
-               // Assign the variable
-               $this->assignVariable($variableName, $content);
-
-               // Purge raw content
-               $this->setRawTemplateData('');
-       }
-
        /**
         * Transfers the content of this template engine to a given response instance
         *
@@ -1207,52 +1460,48 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $responseInstance->writeToBody($this->getCompiledData());
        }
 
-       /**
-        * Assigns all the application data with template variables
-        *
-        * @param       $appInstance    A manageable application instance
-        * @return      void
-        */
-       public function assignApplicationData (ManageableApplication $appInstance) {
-               // Get long name and assign it
-               $this->assignVariable('app_full_name' , $appInstance->getAppName());
-
-               // Get short name and assign it
-               $this->assignVariable('app_short_name', $appInstance->getAppShortName());
-
-               // Get version number and assign it
-               $this->assignVariable('app_version'   , $appInstance->getAppVersion());
-
-               // Assign extra application-depending data
-               $appInstance->assignExtraTemplateData($this);
-       }
-
        /**
         * "Compiles" a variable by replacing {?var?} with it's content
         *
-        * @param       $rawCode        Raw code to compile
+        * @param       $rawCode                        Raw code to compile
+        * @param       $setMatchAsCode         Sets $match if readVariable() returns empty result
         * @return      $rawCode        Compile code with inserted variable value
         */
-       public function compileRawCode ($rawCode) {
+       public function compileRawCode ($rawCode, $setMatchAsCode=FALSE) {
                // Find the variables
-               //* DEBUG: */ echo "rawCode=<pre>".htmlentities($rawCode)."</pre>\n";
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:rawCode=<pre>' . htmlentities($rawCode) . '</pre>');
                preg_match_all($this->regExpVarValue, $rawCode, $varMatches);
 
                // Compile all variables
-               //* DEBUG: */ echo "<pre>".print_r($varMatches, true)."</pre>";
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:<pre>' . print_r($varMatches, TRUE) . '</pre>');
                foreach ($varMatches[0] as $match) {
                        // Add variable tags around it
                        $varCode = '{?' . $match . '?}';
 
+                       // Debug message
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:varCode=' . $varCode);
+
                        // Is the variable found in code? (safes some calls)
-                       if (strpos($rawCode, $varCode) !== false) {
-                               // Replace the variable with it's value, if found
-                               //* DEBUG: */ echo __METHOD__.": match=".$match."<br />\n";
-                               $rawCode = str_replace($varCode, $this->readVariable($match), $rawCode);
+                       if (strpos($rawCode, $varCode) !== FALSE) {
+                               // Debug message
+                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: match=' . $match . ',rawCode[' . gettype($rawCode) . ']=' . $rawCode);
+
+                               // Use $match as new value or $value from read variable?
+                               if ($setMatchAsCode === TRUE) {
+                                       // Insert match
+                                       $rawCode = str_replace($varCode, $match, $rawCode);
+                               } else {
+                                       // Read the variable
+                                       $value = $this->readVariable($match);
+
+                                       // Insert value
+                                       $rawCode = str_replace($varCode, $value, $rawCode);
+                               }
                        } // END - if
                } // END - foreach
 
                // Return the compiled data
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']:rawCode=<pre>' . htmlentities($rawCode) . '</pre>');
                return $rawCode;
        }
 
@@ -1273,7 +1522,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      void
         */
        public function renameVariable ($oldName, $newName) {
-               //* DEBUG: */ echo __METHOD__.": oldName={$oldName}, newName={$newName}<br />\n";
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: oldName=' . $oldName . ', newName=' . $newName);
                // Get raw template code
                $rawData = $this->getRawTemplateData();
 
@@ -1291,7 +1540,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @return      void
         * @throws      XmlParserException      If an XML error was found
         */
-       public function renderXmlContent ($content = null) {
+       public function renderXmlContent ($content = NULL) {
                // Is the content set?
                if (is_null($content)) {
                        // Get current content
@@ -1301,9 +1550,82 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                // Get a XmlParser instance
                $parserInstance = ObjectFactory::createObjectByConfiguredName('xml_parser_class', array($this));
 
+               // Check if we have XML compacting enabled
+               if ($this->isXmlCompactingEnabled()) {
+                       // Yes, so get a decorator class for transparent compacting
+                       $parserInstance = ObjectFactory::createObjectByConfiguredName('deco_compacting_xml_parser_class', array($parserInstance));
+               } // END - if
+
                // Parse the XML document
                $parserInstance->parseXmlContent($content);
        }
+
+       /**
+        * Enables or disables language support
+        *
+        * @param       $languageSupport        New language support setting
+        * @return      void
+        */
+       public final function enableLanguageSupport ($languageSupport = TRUE) {
+               $this->languageSupport = (bool) $languageSupport;
+       }
+
+       /**
+        * Checks whether language support is enabled
+        *
+        * @return      $languageSupport        Whether language support is enabled or disabled
+        */
+       public final function isLanguageSupportEnabled () {
+               return $this->languageSupport;
+       }
+
+       /**
+        * Enables or disables XML compacting
+        *
+        * @param       $xmlCompacting  New XML compacting setting
+        * @return      void
+        */
+       public final function enableXmlCompacting ($xmlCompacting = TRUE) {
+               $this->xmlCompacting = (bool) $xmlCompacting;
+       }
+
+       /**
+        * Checks whether XML compacting is enabled
+        *
+        * @return      $xmlCompacting  Whether XML compacting is enabled or disabled
+        */
+       public final function isXmlCompactingEnabled () {
+               return $this->xmlCompacting;
+       }
+
+       /**
+        * Removes all commentd, tabs and new-line characters to compact the content
+        *
+        * @param       $uncompactedContent             The uncompacted content
+        * @return      $compactedContent               The compacted content
+        */
+       public function compactContent ($uncompactedContent) {
+               // First, remove all tab/new-line/revert characters
+               $compactedContent = str_replace(chr(9), '', str_replace(chr(10), '', str_replace(chr(13), '', $uncompactedContent)));
+
+               // Then regex all comments like <!-- //--> away
+               preg_match_all($this->regExpComments, $compactedContent, $matches);
+
+               // Do we have entries?
+               if (isset($matches[0][0])) {
+                       // Remove all
+                       foreach ($matches[0] as $match) {
+                               // Remove the match
+                               $compactedContent = str_replace($match, '', $compactedContent);
+                       } // END - foreach
+               } // END - if
+
+               // Set the content again
+               $this->setRawTemplateData($compactedContent);
+
+               // Return compacted content
+               return $compactedContent;
+       }
 }
 
 // [EOF]