X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fclass_BaseTemplateEngine.php;h=334ff102e899e7fae1ed29f665493effc436019e;hp=d31f5cfd6127dd026cc4c64823a6816cc5fe3f3c;hb=8904918d814abf3468d084b8826e4d280b0885e3;hpb=ec6bb7da038135934f0d5abfcb82a7a7780945a4 diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php index d31f5cfd..334ff102 100644 --- a/inc/classes/main/template/class_BaseTemplateEngine.php +++ b/inc/classes/main/template/class_BaseTemplateEngine.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -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 @@ -167,26 +167,33 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * Search for a variable in the stack * - * @param $var The variable we are looking for - * @param $stack Optional variable stack to look in - * @return $index FALSE means not found, >=0 means found on a specific index + * @param $variableName The variable we are looking for + * @param $stack Optional variable stack to look in + * @return $index FALSE means not found, >=0 means found on a specific index */ - private function getVariableIndex ($var, $stack = null) { + private function getVariableIndex ($variableName, $stack = NULL) { + // Replace all dashes to underscores to match variables with configuration entries + $variableName = trim($this->convertDashesToUnderscores($variableName)); + // First everything is not found $found = false; // If the stack is null, use the current group - if (is_null($stack)) $stack = $this->currGroup; + if (is_null($stack)) { + // Use current group + //* DEBUG: */ $this->debugOutput(__METHOD__.' currGroup=' . $this->currGroup . ' set as stack!'); + $stack = $this->currGroup; + } // END - if // Is the group there? if ($this->isVarStackSet($stack)) { // Now search for it foreach ($this->getVarStack($stack) as $index => $currEntry) { - //* DEBUG: */ echo __METHOD__.":currGroup={$stack},idx={$index},currEntry={$currEntry['name']},var={$var}
\n"; + //* DEBUG: */ $this->debugOutput(__METHOD__.':currGroup=' . $stack . ',idx=' . $index . ',currEntry=' . $currEntry['name'] . ',variableName=' . $variableName); // Is the entry found? - if ($currEntry['name'] == $var) { + if ($currEntry['name'] == $variableName) { // Found! - //* DEBUG: */ echo __METHOD__.":FOUND!
\n"; + //* DEBUG: */ $this->debugOutput(__METHOD__.':FOUND!'); $found = $index; break; } // END - if @@ -198,10 +205,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } /** - * Checks wether the given variable stack is set + * Checks whether the given variable stack is set * * @param $stack Variable stack to check - * @return $isSet Wether the given variable stack is set + * @return $isSet Whether the given variable stack is set */ protected final function isVarStackSet ($stack) { // Check it @@ -235,19 +242,26 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * Return a content of a variable or null if not found * - * @param $var The variable we are looking for - * @param $stack Optional variable stack to look in - * @return $content Content of the variable or null if not found + * @param $variableName The variable we are looking for + * @param $stack Optional variable stack to look in + * @return $content Content of the variable or null if not found */ - protected function readVariable ($var, $stack = null) { + protected function readVariable ($variableName, $stack = 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($stack)) $stack = $this->currGroup; + if (is_null($stack)) { + // Use current group + //* DEBUG: */ $this->debugOutput(__METHOD__.' currGroup=' . $this->currGroup . ' set as stack!'); + $stack = $this->currGroup; + } // END - if // Get variable index - $found = $this->getVariableIndex($var, $stack); + $found = $this->getVariableIndex($variableName, $stack); // Is the variable found? if ($found !== false) { @@ -256,29 +270,29 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } // END - if // Return the current position - //* DEBUG: */ echo __METHOD__.": group=".$stack.",var=".$var.", content[".gettype($content)."]=".$content."
\n"; + //* DEBUG: */ $this->debugOutput(__METHOD__.': group=' . $stack . ',variableName=' . $variableName . ', content[' . gettype($content) . ']=' . $content); return $content; } /** * Add a variable to the stack * - * @param $var The variable we are looking for + * @param $variableName The variable we are looking for * @param $value The 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 @@ -298,12 +312,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * Settter for variable group * * @param $groupName Name of variable group - * @param $add Wether add this group + * @param $add Whether add this group * @return void */ public function setVariableGroup ($groupName, $add = true) { // Set group name - //* DEBIG: */ echo __METHOD__.": currGroup=".$groupName."
\n"; + //* DEBIG: */ $this->debugOutput(__METHOD__.': currGroup=' . $groupName); $this->currGroup = $groupName; // Skip group 'general' @@ -316,18 +330,22 @@ 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."
\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: */ $this->debugOutput(__METHOD__.': group=' . $this->currGroup . ', variableName=' . $variableName . ', value=' . $value); // Get current variables in group $currVars = $this->readCurrentGroup(); // Append our variable - $currVars[] = $this->generateVariableArray($var, $value); + $currVars[] = $this->generateVariableArray($variableName, $value); // Add it to the stack $this->setVarStack($this->currGroup, $currVars); @@ -348,19 +366,22 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * 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 - $index = $this->getVariableIndex($var); + $index = $this->getVariableIndex($variableName); // Is the variable set? if ($index === false) { // Unset variables cannot be modified - throw new NoVariableException(array($this, $var, $value), self::EXCEPTION_VARIABLE_IS_MISSING); + throw new NoVariableException(array($this, $variableName, $value), self::EXCEPTION_VARIABLE_IS_MISSING); } // END - if // Then modify it @@ -384,19 +405,22 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * variable is already set. If so, the variable got modified, otherwise * added. * - * @param $varGroup Variable group to use - * @param $var Variable to set - * @param $value Value to set + * @param $varGroup Variable group to use + * @param $variableName Variable to set + * @param $value Value to set * @return void */ - protected function setVariable ($varGroup, $var, $value) { + 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($var); + $index = $this->getVariableIndex($variableName); // Is the variable set? if ($index === false) { // Not found, add it - $this->varStack[$varGroup][] = $this->generateVariableArray($var, $value); + $this->varStack[$varGroup][] = $this->generateVariableArray($variableName, $value); } else { // Then modify it $this->setVariableValue($this->currGroup, $index, $value); @@ -407,14 +431,17 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * "Generates" (better returns) an array for all variables for given * variable/value pay. * - * @param $var Variable to set - * @param $value Value to set - * @return $varData Variable data array + * @param $variableName Variable to set + * @param $value Value to set + * @return $varData Variable data array */ - private function generateVariableArray ($var, $value) { + 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' => $var, + 'name' => $variableName, 'value' => $value ); @@ -553,45 +580,45 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * Assign (add) a given variable with a value * - * @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 EmptyVariableException If the variable name is left empty */ - public final function assignVariable ($var, $value) { - // Trim spaces of variable name - $var = trim($var); + 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($var)) { + if (empty($variableName)) { // Throw an exception - throw new EmptyVariableException(array($this, 'var'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); + 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($var); + $index = $this->getVariableIndex($variableName); // Was it found? if ($index === false) { // Add it to the stack - //* DEBUG: */ echo "ADD: ".$var."
\n"; - $this->addVariable($var, $value); + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':ADD: ' . $variableName . '[' . gettype($value) . ']=' . $value); + $this->addVariable($variableName, $value); } elseif (!empty($value)) { // Modify the stack entry - //* DEBUG: */ echo "MOD: ".$var."
\n"; - $this->modifyVariable($var, $value); + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':MOD: ' . $variableName . '[' . gettype($value) . ']=' . $value); + $this->modifyVariable($variableName, $value); } } /** * Removes a given variable * - * @param $var The variable we are looking for + * @param $variableName The variable we are looking for * @return void */ - public final function removeVariable ($var) { + public final function removeVariable ($variableName) { // First search for the variable if it was already added - $index = $this->getVariableIndex($var); + $index = $this->getVariableIndex($variableName); // Was it found? if ($index !== false) { @@ -625,8 +652,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.
\n'; - //* DEBUG: */ echo $this->currGroup.' variables: '.count($this->getVarStack($this->currGroup)).', groups='.count($this->varStack).'
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__.': ' . strlen($rawTemplateData) . ' Bytes set.'); + //* DEBUG: */ $this->debugOutput(__METHOD__.': ' . $this->currGroup . ' variables: ' . count($this->getVarStack($this->currGroup)) . ', groups=' . count($this->varStack)); $this->rawTemplateData = (string) $rawTemplateData; } @@ -636,7 +663,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.
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': ' . strlen($this->rawTemplateData) . ' Bytes read.'); return $this->rawTemplateData; } @@ -647,7 +674,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.
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': ' . strlen($compiledData) . ' Bytes set.'); $this->compiledData = (string) $compiledData; } @@ -657,7 +684,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * @return $compiledData Compiled template data */ public final function getCompiledData () { - //* DEBUG: */ echo __METHOD__.':'.$this->getUniqueId().': '.strlen($this->compiledData).' Bytes read.
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': ' . strlen($this->compiledData) . ' Bytes read.'); return $this->compiledData; } @@ -734,7 +761,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { $ioInstance = $this->getFileIoInstance(); // Some debug code to look on the file which is being loaded - //* DEBUG: */ echo __METHOD__.": FQFN=".$fqfn."
\n"; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': FQFN=' . $fqfn); // Load the raw template $rawTemplateData = $ioInstance->loadFileContents($fqfn); @@ -750,18 +777,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: */ $this->debugOutput(__METHOD__ . ': 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); } } @@ -776,7 +810,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: */ $this->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)) { @@ -813,26 +850,30 @@ 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: */ $this->debugOutput(__METHOD__ . ':template=' . $template); // Template not found, but maybe variable assigned? - //* DEBUG: */ echo __METHOD__.":template={$template}
\n"; - if ($this->getVariableIndex($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 ($this->getVariableIndex($template, 'config')) { + } elseif ($this->getVariableIndex($template) !== false) { // Use that content here - $this->loadedRawData[$template] = $this->readVariable($template, 'config'); + $this->loadedRawData[$template] = $this->readVariable($template); // Recursive protection: $this->loadedTemplates[] = $template; @@ -961,8 +1002,16 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * @todo Unfinished work or don't die here. */ private function assignAllVariables (array $varMatches) { + // Debug message + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':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 + $this->debugOutput(__METHOD__ . ':key=' . $key . ',var=' . $var); // Detect leading equals if (substr($varMatches[2][$key], 0, 1) == '=') { @@ -971,15 +1020,14 @@ 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!'); } - - } // for ($varMatches ... + } // END - foreach } /** @@ -989,40 +1037,42 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * @return void */ private function compileRawTemplateData (array $templateMatches) { + // Debug message + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':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: */ $this->debugOutput(__METHOD__ . ':template=' . $template . ',code(' . strlen($code) . ')=' . $code); // Is this template already compiled? if (in_array($template, $this->compiledTemplates)) { // Then skip it + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': 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]))) { - // Split it up with another reg. exp. into variable=value pairs preg_match_all($this->regExpVarValue, $templateMatches[3][$foundIndex], $varMatches); + //* NOISY-DEBUG: */ $this->debugOutput(__METHOD__ . ':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) ... } @@ -1047,7 +1097,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { private function finalizeVariableCompilation () { // Get the content $content = $this->getRawTemplateData(); - //* DEBUG: */ echo __METHOD__.': content before='.strlen($content).' ('.md5($content).')
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': content before=' . strlen($content) . ' (' . md5($content) . ')'); // Do we have the stack? if (!$this->isVarStackSet('general')) { @@ -1058,7 +1108,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { // Walk through all variables foreach ($this->getVarStack('general') as $currEntry) { - //* DEBUG: */ echo __METHOD__.': name='.$currEntry['name'].', value=
'.htmlentities($currEntry['value']).'
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': name=' . $currEntry['name'] . ', value=
' . htmlentities($currEntry['value']) . '
'); // Replace all [$var] or {?$var?} with the content // @TODO Old behaviour, will become obsolete! $content = str_replace('$content[' . $currEntry['name'] . ']', $currEntry['value'], $content); @@ -1070,7 +1120,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { $content = str_replace('{?' . $currEntry['name'] . '?}', $currEntry['value'], $content); } // END - for - //* DEBUG: */ echo __METHOD__.': content after='.strlen($content).' ('.md5($content).')
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': content after=' . strlen($content) . ' (' . md5($content) . ')'); // Set the content back $this->setRawTemplateData($content); @@ -1094,13 +1144,16 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * 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}
\n'; - $this->setVariable('config', $var, $this->getConfigInstance()->getConfigEntry($var)); + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': variableName=' . $variableName . ',getConfigEntry()=' . $this->getConfigInstance()->getConfigEntry($variableName)); + $this->setVariable('config', $variableName, $this->getConfigInstance()->getConfigEntry($variableName)); } /** @@ -1129,19 +1182,23 @@ class BaseTemplateEngine extends BaseFrameworkSystem { // Do we have the stack? if (!$this->isVarStackSet('general')) { // Abort here silently - // @TODO This silent abort should be logged, maybe. + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': Aborted, variable stack general not found!'); return; } // END - if // Iterate through all general variables - foreach ($this->getVarStack('general') as $index=>$currVariable) { + foreach ($this->getVarStack('general') as $index => $currVariable) { // Compile the value $value = $this->compileRawCode($this->readVariable($currVariable['name']), true); + // Debug message + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': name=' . $currVariable['name'] . ',value=' . $value); + // Remove it from stack - $this->removeVariable($index, 'general'); + $this->removeVariable($currVariable['name'], 'general'); // Re-assign the variable + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': value='. $value . ',name=' . $currVariable['name'] . ',index=' . $index); $this->assignConfigVariable($value); } // END - foreach } @@ -1160,19 +1217,13 @@ class BaseTemplateEngine extends BaseFrameworkSystem { // Iterate through all general variables foreach ($this->getVarStack('general') as $currVariable) { // Transfer it's name/value combination to the $content array - //* DEBUG: */ echo $currVariable['name'].'=
'.htmlentities($currVariable['value']).'
\n'; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':' . $currVariable['name'] . '=
' . htmlentities($currVariable['value']).'
'); $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 ($this->isVarStackSet('config')) { - $config = $this->getVarStack('config'); - } // END - if - // Remove some variables unset($index); unset($currVariable); @@ -1272,6 +1323,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem { // Search for code-tags which are {? ?} preg_match_all($this->regExpCodeTags, $rawData, $templateMatches); + // Debug message + //* NOISY-DEBUG: */ $this->debugOutput(__METHOD__ . ':templateMatches=' . print_r($templateMatches , true)); + // Analyze the matches array if ((is_array($templateMatches)) && (count($templateMatches) == 4) && (count($templateMatches[0]) > 0)) { // Entries are found: @@ -1287,15 +1341,12 @@ 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 ... } @@ -1312,7 +1363,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { // Is this view helper loaded? if (!isset($this->helpers[$helperName])) { // Create a class name - $className = "{$helperName}ViewHelper"; + $className = $helperName . 'ViewHelper'; // Generate new instance $this->helpers[$helperName] = ObjectFactory::createObjectByName($className); @@ -1380,24 +1431,31 @@ class BaseTemplateEngine extends BaseFrameworkSystem { */ public function compileRawCode ($rawCode, $setMatchAsCode=false) { // Find the variables - //* DEBUG: */ echo __METHOD__.":rawCode=
".htmlentities($rawCode)."
\n"; + //* NOISY-DEBUG: */ $this->debugOutput(__METHOD__ . ':rawCode=
' . htmlentities($rawCode) . '
'); preg_match_all($this->regExpVarValue, $rawCode, $varMatches); // Compile all variables - //* DEBUG: */ echo __METHOD__.":
".print_r($varMatches, true)."
\n"; + //* NOISY-DEBUG: */ $this->debugOutput(__METHOD__ . ':
' . print_r($varMatches, true) . '
'); foreach ($varMatches[0] as $match) { // Add variable tags around it $varCode = '{?' . $match . '?}'; + // Debug message + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':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 - $value = $this->readVariable($match); - //* DEBUG: */ echo __METHOD__.": match=".$match.",value[".gettype($value)."]=".$value."
\n"; - if (($setMatchAsCode === true) && (is_null($value))) { + // Debug message + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': 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); } @@ -1405,7 +1463,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } // END - foreach // Return the compiled data - //* DEBUG: */ echo __METHOD__.":rawCode=
".htmlentities($rawCode)."
\n"; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ':rawCode=
' . htmlentities($rawCode) . '
'); return $rawCode; } @@ -1426,7 +1484,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { * @return void */ public function renameVariable ($oldName, $newName) { - //* DEBUG: */ echo __METHOD__.": oldName={$oldName}, newName={$newName}
\n"; + //* DEBUG: */ $this->debugOutput(__METHOD__ . ': oldName=' . $oldName . ', newName=' . $newName); // Get raw template code $rawData = $this->getRawTemplateData(); @@ -1444,7 +1502,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 @@ -1475,9 +1533,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } /** - * Checks wether language support is enabled + * Checks whether language support is enabled * - * @return $languageSupport Wether language support is enabled or disabled + * @return $languageSupport Whether language support is enabled or disabled */ public final function isLanguageSupportEnabled () { return $this->languageSupport; @@ -1494,9 +1552,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } /** - * Checks wether XML compacting is enabled + * Checks whether XML compacting is enabled * - * @return $xmlCompacting Wether XML compacting is enabled or disabled + * @return $xmlCompacting Whether XML compacting is enabled or disabled */ public final function isXmlCompactingEnabled () { return $this->xmlCompacting; @@ -1510,7 +1568,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { */ public function compactContent ($uncompactedContent) { // First, remove all tab/new-line/revert characters - $compactedContent = str_replace("\t", '', str_replace("\n", '', str_replace("\r", '', $uncompactedContent))); + $compactedContent = str_replace(chr(9), '', str_replace(chr(10), '', str_replace(chr(13), '', $uncompactedContent))); // Then regex all comments like away preg_match_all('//', $compactedContent, $matches); @@ -1524,6 +1582,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } // END - foreach } // END - if + // Set the content again + $this->setRawTemplateData($compactedContent); + // Return compacted content return $compactedContent; }