Configuration data is now being inserted as same as other data.

[core.git] / inc / classes / main / template / class_BaseTemplateEngine.php

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index 60f5a3cd1433d90e858f91d567c28991b89c49a5..ba5208cb3e7bc3b9ac8b1d5ef52ebebe2ce5fcc6 100644 (file)
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -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);
@@ -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
@@ -1188,7 +1188,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
                // Sweet and simple...
                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: variableName=' . $variableName . ',getConfigEntry()=' . $this->getConfigInstance()->getConfigEntry($variableName));
-               $this->setVariable('config', $variableName, $this->getConfigInstance()->getConfigEntry($variableName));
+               $this->assignVariable($variableName, $this->getConfigInstance()->getConfigEntry($variableName));
        }
 
        /**
@@ -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;
        }
 
        /**
@@ -1550,7 +1550,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                // Get a XmlParser instance
                $parserInstance = ObjectFactory::createObjectByConfiguredName('xml_parser_class', array($this));
 
-               // Check if we have XML compacting enabled
+               // Check if XML compacting is enabled
                if ($this->isXmlCompactingEnabled()) {
                        // Yes, so get a decorator class for transparent compacting
                        $parserInstance = ObjectFactory::createObjectByConfiguredName('deco_compacting_xml_parser_class', array($parserInstance));