X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=b838f086a07cb71373d4b43555cb7fa3ab1ac8b4;hp=7134e1f0f2ef68e9ff05e9271d7c37e63153ff8d;hb=5f25dbe2aab8c57f820caaf48708bef1dd56f417;hpb=8ec82aa8ce39be68e4087a26f9763b86fc124ed4

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 7134e1f0f2..b838f086a0 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -56,7 +56,7 @@ function enableTemplateHtml ($enable = true) {
 // Default: true
 function isTemplateHtml () {
 	// Is the output_mode other than 0 (HTML), then no comments are enabled
-	if (getScriptOutputMode() != 0) {
+	if (!isHtmlOutputMode()) {
 		// No HTML
 		return false;
 	} else {
@@ -180,14 +180,16 @@ function compileFinalOutput () {
 	$GLOBALS['output'] = doFinalCompilation($GLOBALS['output']);
 
 	// Extension 'rewrite' installed?
-	if ((isExtensionActive('rewrite')) && (getScriptOutputMode() != 1)) {
+	if ((isExtensionActive('rewrite')) && (!isCssOutputMode())) {
 		$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 	} // END - if
 
 	// Compress it?
+	/**
+	 * @TODO On some pages this is buggy
 	if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
 		// Compress it for HTTP gzip
-		$GLOBALS['output'] = gzencode($GLOBALS['output'], 9, true);
+		$GLOBALS['output'] = gzencode($GLOBALS['output'], 9);
 
 		// Add header
 		sendHeader('Content-Encoding: gzip');
@@ -198,6 +200,7 @@ function compileFinalOutput () {
 		// Add header
 		sendHeader('Content-Encoding: deflate');
 	}
+	*/
 
 	// Add final length
 	sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
@@ -223,8 +226,9 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
 		// Compile it
 		//* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
 		$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), false, true, $enableCodes)) . '";';
-		//* DEBUG: */ if (!$insertComments) print('<pre>'.linenumberCode($eval).'</pre>');
+		//* DEBUG: */ if (!$insertComments) print('EVAL=<pre>'.linenumberCode($eval).'</pre>');
 		eval($eval);
+		//* DEBUG: */ if (!$insertComments) print('NEW=<pre>'.linenumberCode($newContent).'</pre>');
 		//* DEBUG: */ die('<pre>'.encodeEntities($newContent).'</pre>');
 
 		// Was that eval okay?
@@ -295,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 (getScriptOutputMode() == '0') {
+				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()))) {
@@ -476,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">
@@ -494,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--}';
@@ -503,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.";
@@ -647,7 +654,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
 }
 
 //
-function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') {
+function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'guest_select') {
 	$OUT = '';
 
 	if ($type == 'yn') {
@@ -1071,10 +1078,10 @@ function generateEmailLink ($email, $table = 'admins') {
 		$EMAIL = generateAdminEmailLink($email);
 	} elseif ((isExtensionInstalledAndNewer('user', '0.3.3')) && ($table == 'user_data')) {
 		// Create email link for contacting a member within admin area (or later in other areas, too?)
-		$EMAIL = generateUserEmailLink($email, 'admin');
+		$EMAIL = generateUserEmailLink($email);
 	} elseif ((isExtensionActive('sponsor')) && ($table == 'sponsor_data')) {
 		// Create email link to contact sponsor within admin area (or like the link above?)
-		$EMAIL = generateSponsorEmailLink($email, 'sponsor_data');
+		$EMAIL = generateSponsorEmailLink($email);
 	}
 
 	// Shall I close the link when there is no admin?
@@ -1126,7 +1133,9 @@ function displayParsingTime () {
 	$start = explode(' ', $GLOBALS['startTime']);
 	$end = explode(' ', $endTime);
 	$runTime = $end[0] - $start[0];
-	if ($runTime < 0) $runTime = '0';
+	if ($runTime < 0) {
+		$runTime = '0';
+	} // END - if
 
 	// Prepare output
 	// @TODO This can be easily moved out after the merge from EL branch to this is complete
@@ -1237,12 +1246,12 @@ function generateExtensionInactiveMessage ($ext_name) {
 	} // END - if
 
 	// Default message
-	$message = getMaskedMessage('EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
+	$message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name);
 
 	// Is an admin logged in?
 	if (isAdmin()) {
 		// Then output admin message
-		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
+		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name);
 	} // END - if
 
 	// Return prepared message
@@ -1479,7 +1488,7 @@ function sendModeMails ($mod, $modes) {
 								$content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestParameter('old_email') . "\n";
 								break;
 
-							case 'pass': // Password was changed
+							case 'password': // Password was changed
 								$content['message'] = '{--MEMBER_CHANGED_PASS--}' . "\n";
 								break;