From 61f8fd5807163143e88d19c5fc4208ccffb6e774 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 17 Aug 2010 06:29:00 +0000
Subject: [PATCH] Some improvements

---
 inc/template-functions.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/inc/template-functions.php b/inc/template-functions.php
index d96bfb7395..37b557fb74 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -299,28 +299,28 @@ function loadTemplate ($template, $return = false, $content = array()) {
 			incrementConfigEntry('num_templates');
 
 			// The local file does exists so we load it. :)
-			$GLOBALS['tpl_content'] = readFromFile($FQFN);
+			$GLOBALS['tpl_content'][$template] = readFromFile($FQFN);
 
 			// Do we have to compile the code?
 			$ret = '';
-			if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
+			if ((strpos($GLOBALS['tpl_content'][$template], '$') !== false) || (strpos($GLOBALS['tpl_content'][$template], '{--') !== false) || (strpos($GLOBALS['tpl_content'][$template], '{?') !== false) || (strpos($GLOBALS['tpl_content'][$template], '{%') !== false)) {
 				// Normal HTML output?
 				if (isHtmlOutputMode()) {
 					// Add surrounding HTML comments to help finding bugs faster
-					$ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . ' - End //-->';
+					$ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'][$template] . '<!-- Template ' . $template . ' - End //-->';
 
 					// Prepare eval() command
 					$GLOBALS['template_eval'][$template] = '$ret = "' . getColorSwitchCode($template) . compileCode(escapeQuotes($ret)) . '";';
 				} elseif (substr($template, 0, 3) == 'js_') {
 					// JavaScripts don't like entities and timings
-					$GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'])) . '");';
+					$GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'][$template])) . '");';
 				} else {
 					// Prepare eval() command, other output doesn't like entities, maybe
-					$GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
+					$GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'][$template])) . '");';
 				}
 			} else {
 				// Add surrounding HTML comments to help finding bugs faster
-				$ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . ' - End //-->';
+				$ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'][$template] . '<!-- Template ' . $template . ' - End //-->';
 				$GLOBALS['template_eval'][$template] = '$ret = "' . getColorSwitchCode($template) . compileRawCode(escapeQuotes($ret)) . '";';
 			} // END - if
 		} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
@@ -480,11 +480,11 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 	$newContent = '';
 	if (isFileReadable($FQFN)) {
 		// The local file does exists so we load it. :)
-		$GLOBALS['tpl_content'] = readFromFile($FQFN);
+		$GLOBALS['tpl_content'][$template] = readFromFile($FQFN);
 
 		// Run code
-		$GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
-		eval($GLOBALS['tpl_content']);
+		$GLOBALS['tpl_content'][$template] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'][$template])) . '");';
+		eval($GLOBALS['tpl_content'][$template]);
 	} elseif (!empty($template)) {
 		// Template file not found!
 		$newContent = '<div class="para">
@@ -498,7 +498,10 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 </div>';
 
 		// Debug mode not active? Then remove the HTML tags
-		if (!isDebugModeEnabled()) $newContent = secureString($newContent);
+		if (!isDebugModeEnabled()) {
+			// Remove HTML tags
+			$newContent = secureString($newContent);
+		} // END - if
 	} else {
 		// No template name supplied!
 		$newContent = '{--NO_TEMPLATE_SUPPLIED--}';
@@ -507,7 +510,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 	// Is there some content?
 	if (empty($newContent)) {
 		// Compiling failed
-		$newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'];
+		$newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'][$template];
 
 		// Add last error if the required function exists
 		if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
-- 
2.39.5