Use this?

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index ed974689a5001031e481f95e56d764037914cdc0..577c4ea6a9b0bdd2504e7b64d423d39c56f90c3a 100644 (file)
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -134,12 +134,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        /**
         * Language support is enabled by default
         */
        /**
         * Language support is enabled by default
         */

-       private $languageSupport = true;
+       private $languageSupport = TRUE;

 
        /**
         * XML compacting is disabled by default
         */
 
        /**
         * XML compacting is disabled by default
         */

-       private $xmlCompacting = false;
+       private $xmlCompacting = FALSE;

 
        // Exception codes for the template engine
        const EXCEPTION_TEMPLATE_TYPE_IS_UNEXPECTED   = 0x110;
 
        // Exception codes for the template engine
        const EXCEPTION_TEMPLATE_TYPE_IS_UNEXPECTED   = 0x110;


@@ -176,7 +176,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $variableName = trim($this->convertDashesToUnderscores($variableName));
 
                // First everything is not found
                $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)) {
 
                // If the stack is null, use the current group
                if (is_null($variableGroup)) {


@@ -264,7 +264,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $found = $this->getVariableIndex($variableName, $variableGroup);
 
                // Is the variable found?
                $found = $this->getVariableIndex($variableName, $variableGroup);
 
                // Is the variable found?

-               if ($found !== false) {
+               if ($found !== FALSE) {

                        // Read it
                        $content = $this->getVariableValue($variableGroup, $found);
                } // END - if
                        // Read it
                        $content = $this->getVariableValue($variableGroup, $found);
                } // END - if


@@ -315,13 +315,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @param       $add            Whether add this group
         * @return      void
         */
         * @param       $add            Whether add this group
         * @return      void
         */

-       public function setVariableGroup ($groupName, $add = true) {
+       public function setVariableGroup ($groupName, $add = TRUE) {

                // Set group name
                //* DEBIG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__.': currGroup=' . $groupName);
                $this->currGroup = $groupName;
 
                // Skip group 'general'
                // Set group name
                //* 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
        }
                        $this->varGroups[$groupName] = 'OK';
                } // END - if
        }


@@ -379,7 +379,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $index = $this->getVariableIndex($variableName);
 
                // Is the variable set?
                $index = $this->getVariableIndex($variableName);
 
                // Is the variable set?

-               if ($index === false) {
+               if ($index === FALSE) {

                        // Unset variables cannot be modified
                        throw new NoVariableException(array($this, $variableName, $value), self::EXCEPTION_VARIABLE_IS_MISSING);
                } // END - if
                        // Unset variables cannot be modified
                        throw new NoVariableException(array($this, $variableName, $value), self::EXCEPTION_VARIABLE_IS_MISSING);
                } // END - if


@@ -418,7 +418,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $index = $this->getVariableIndex($variableName);
 
                // Is the variable set?
                $index = $this->getVariableIndex($variableName);
 
                // Is the variable set?

-               if ($index === false) {
+               if ($index === FALSE) {

                        // Not found, add it
                        $this->varStack[$varGroup][] = $this->generateVariableArray($variableName, $value);
                } else {
                        // Not found, add it
                        $this->varStack[$varGroup][] = $this->generateVariableArray($variableName, $value);
                } else {


@@ -599,7 +599,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $index = $this->getVariableIndex($variableName);
 
                // Was it found?
                $index = $this->getVariableIndex($variableName);
 
                // Was it found?

-               if ($index === false) {
+               if ($index === FALSE) {

                        // Add it to the stack
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':ADD: ' . $variableName . '[' . gettype($value) . ']=' . $value);
                        $this->addVariable($variableName, $value);
                        // Add it to the stack
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':ADD: ' . $variableName . '[' . gettype($value) . ']=' . $value);
                        $this->addVariable($variableName, $value);


@@ -622,8 +622,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                $index = $this->getVariableIndex($variableName, $variableGroup);
 
                // Was it found?
                $index = $this->getVariableIndex($variableName, $variableGroup);
 
                // Was it found?

-               if ($index !== false) {
+               if ($index !== FALSE) {

                        // Remove this variable
                        // Remove this variable

+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':UNSET: variableGroup=' . $variableGroup . ',variableName=' . $variableName . ',index=' . $index);

                        $this->unsetVariableStackOffset($index, $variableGroup);
                } // END - if
        }
                        $this->unsetVariableStackOffset($index, $variableGroup);
                } // END - if
        }


@@ -821,7 +822,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                preg_match_all('/\$(\w+)(\[(\w+)\])?/', $rawData, $variableMatches);
 
                // Debug message
                preg_match_all('/\$(\w+)(\[(\w+)\])?/', $rawData, $variableMatches);
 
                // Debug message

-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':rawData(' . strlen($rawData) . ')=' . $rawData . ',variableMatches=' . print_r($variableMatches, true));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':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)) {
 
                // Did we find some variables?
                if ((is_array($variableMatches)) && (count($variableMatches) == 4) && (count($variableMatches[0]) > 0)) {


@@ -873,13 +874,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':template=' . $template);
 
                                // Template not found, but maybe variable assigned?
                                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':template=' . $template);
 
                                // Template not found, but maybe variable assigned?

-                               if ($this->getVariableIndex($template, 'config') !== false) {
+                               if ($this->getVariableIndex($template, 'config') !== FALSE) {

                                        // Use that content here
                                        $this->loadedRawData[$template] = $this->readVariable($template, 'config');
 
                                        // Recursive protection:
                                        $this->loadedTemplates[] = $template;
                                        // Use that content here
                                        $this->loadedRawData[$template] = $this->readVariable($template, 'config');
 
                                        // Recursive protection:
                                        $this->loadedTemplates[] = $template;

-                               } elseif ($this->getVariableIndex($template) !== false) {
+                               } elseif ($this->getVariableIndex($template) !== FALSE) {

                                        // Use that content here
                                        $this->loadedRawData[$template] = $this->readVariable($template);
 
                                        // Use that content here
                                        $this->loadedRawData[$template] = $this->readVariable($template);
 


@@ -957,7 +958,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        $foundIndex = array_search($template, $templateMatches[1]);
 
                        // Lookup the matching template replacement
                        $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();
 
                                // Get the current raw template
                                $rawData = $this->getRawTemplateData();


@@ -1066,10 +1067,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                                $foundIndex = array_search($template, $templateMatches[1]);
 
                                // Lookup the matching variable data
                                $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);
                                        // 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(__METHOD__ . ':varMatches=' . print_r($varMatches, true));
+                                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':varMatches=' . print_r($varMatches, TRUE));

 
                                        // Assign all variables
                                        $this->assignAllVariables($varMatches);
 
                                        // Assign all variables
                                        $this->assignAllVariables($varMatches);


@@ -1197,7 +1198,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                // Iterate through all general variables
                foreach ($this->getVarStack('general') as $index => $currVariable) {
                        // Compile the value
                // Iterate through all general variables
                foreach ($this->getVarStack('general') as $index => $currVariable) {
                        // Compile the value

-                       $value = $this->compileRawCode($this->readVariable($currVariable['name']), true);
+                       $value = $this->compileRawCode($this->readVariable($currVariable['name']), TRUE);

 
                        // Debug message
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ': name=' . $currVariable['name'] . ',value=' . $value);
 
                        // Debug message
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ': name=' . $currVariable['name'] . ',value=' . $value);


@@ -1207,7 +1208,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
                        // Re-assign the variable
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ': value='. $value . ',name=' . $currVariable['name'] . ',index=' . $index);
 
                        // Re-assign the variable
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ': value='. $value . ',name=' . $currVariable['name'] . ',index=' . $index);

-                       $this->assignConfigVariable($value);
+                       $this->setVariable('config', $currVariable['name'], $value);

                } // END - foreach
        }
 
                } // END - foreach
        }
 


@@ -1248,7 +1249,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        );
 
                        // This loop does remove the backslashes (\) in PHP parameters
                        );
 
                        // 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));
 
                                // Get left part before "<?"
                                $evalLeft = substr($eval, 0, strpos($eval, $this->codeBegin));
 


@@ -1282,7 +1283,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        // Goes something wrong?
                        if ((!isset($result)) || (empty($result))) {
                                // Output eval command
                        // Goes something wrong?
                        if ((!isset($result)) || (empty($result))) {
                                // Output eval command

-                               self::createDebugInstance(__CLASS__)->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();
 
                                // Output backtrace here
                                $this->debugBackTrace();


@@ -1332,7 +1333,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                preg_match_all($this->regExpCodeTags, $rawData, $templateMatches);
 
                // Debug message
                preg_match_all($this->regExpCodeTags, $rawData, $templateMatches);
 
                // Debug message

-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':templateMatches=' . print_r($templateMatches , true));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':templateMatches=' . print_r($templateMatches , TRUE));

 
                // Analyze the matches array
                if ((is_array($templateMatches)) && (count($templateMatches) == 4) && (count($templateMatches[0]) > 0)) {
 
                // Analyze the matches array
                if ((is_array($templateMatches)) && (count($templateMatches) == 4) && (count($templateMatches[0]) > 0)) {


@@ -1437,13 +1438,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @param       $setMatchAsCode         Sets $match if readVariable() returns empty result
         * @return      $rawCode        Compile code with inserted variable value
         */
         * @param       $setMatchAsCode         Sets $match if readVariable() returns empty result
         * @return      $rawCode        Compile code with inserted variable value
         */

-       public function compileRawCode ($rawCode, $setMatchAsCode=false) {
+       public function compileRawCode ($rawCode, $setMatchAsCode=FALSE) {

                // Find the variables
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':rawCode=<pre>' . htmlentities($rawCode) . '</pre>');
                preg_match_all($this->regExpVarValue, $rawCode, $varMatches);
 
                // Compile all variables
                // Find the variables
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':rawCode=<pre>' . htmlentities($rawCode) . '</pre>');
                preg_match_all($this->regExpVarValue, $rawCode, $varMatches);
 
                // Compile all variables

-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':<pre>' . print_r($varMatches, true) . '</pre>');
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':<pre>' . print_r($varMatches, TRUE) . '</pre>');

                foreach ($varMatches[0] as $match) {
                        // Add variable tags around it
                        $varCode = '{?' . $match . '?}';
                foreach ($varMatches[0] as $match) {
                        // Add variable tags around it
                        $varCode = '{?' . $match . '?}';


@@ -1452,12 +1453,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':varCode=' . $varCode);
 
                        // Is the variable found in code? (safes some calls)
                        //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ':varCode=' . $varCode);
 
                        // Is the variable found in code? (safes some calls)

-                       if (strpos($rawCode, $varCode) !== false) {
+                       if (strpos($rawCode, $varCode) !== FALSE) {

                                // Debug message
                                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ': match=' . $match . ',rawCode[' . gettype($rawCode) . ']=' . $rawCode);
 
                                // Use $match as new value or $value from read variable?
                                // Debug message
                                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(__METHOD__ . ': match=' . $match . ',rawCode[' . gettype($rawCode) . ']=' . $rawCode);
 
                                // Use $match as new value or $value from read variable?

-                               if ($setMatchAsCode === true) {
+                               if ($setMatchAsCode === TRUE) {

                                        // Insert match
                                        $rawCode = str_replace($varCode, $match, $rawCode);
                                } else {
                                        // Insert match
                                        $rawCode = str_replace($varCode, $match, $rawCode);
                                } else {


@@ -1536,7 +1537,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @param       $languageSupport        New language support setting
         * @return      void
         */
         * @param       $languageSupport        New language support setting
         * @return      void
         */

-       public final function enableLanguageSupport ($languageSupport = true) {
+       public final function enableLanguageSupport ($languageSupport = TRUE) {

                $this->languageSupport = (bool) $languageSupport;
        }
 
                $this->languageSupport = (bool) $languageSupport;
        }
 


@@ -1555,7 +1556,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @param       $xmlCompacting  New XML compacting setting
         * @return      void
         */
         * @param       $xmlCompacting  New XML compacting setting
         * @return      void
         */

-       public final function enableXmlCompacting ($xmlCompacting = true) {
+       public final function enableXmlCompacting ($xmlCompacting = TRUE) {

                $this->xmlCompacting = (bool) $xmlCompacting;
        }
 
                $this->xmlCompacting = (bool) $xmlCompacting;
        }