X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=4086492753c43731870cf2d2198a478800be9d07;hb=c58447e435311fd667a7e01d932a95f2e7de1dc7;hp=3ff65a4540d57640da39e5997ec75acb992546c7;hpb=ff9e8f739bd4b6e184b2a6bf427334196e501da8;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3ff65a4540..4086492753 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 {
@@ -82,25 +82,6 @@ function fixEmptyContentToDashes ($str) {
 	return $str;
 }
 
-// Color-switch helper function
-function doTemplateColorSwitch ($template, $clear = false, $return = true) {
-	// Is it there?
-	if (!isset($GLOBALS['color_switch'][$template])) {
-		// Initialize it
-		initTemplateColorSwitch($template);
-	} elseif ($clear === false) {
-		// Switch color if called from loadTemplate()
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SWITCH:' . $template);
-		$GLOBALS['color_switch'][$template] = 3 - $GLOBALS['color_switch'][$template];
-	} // END - if
-
-	// Return CSS class name
-	if ($return === true) {
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'RETURN:' . $template . '=' . $GLOBALS['color_switch'][$template]);
-		return 'switch_sw' . $GLOBALS['color_switch'][$template];
-	} // END - if
-}
-
 // Init color switch
 function initTemplateColorSwitch ($template) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'INIT:' . $template);
@@ -199,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');
@@ -217,6 +200,7 @@ function compileFinalOutput () {
 		// Add header
 		sendHeader('Content-Encoding: deflate');
 	}
+	*/
 
 	// Add final length
 	sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
@@ -299,9 +283,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
 		$basePath = sprintf("%stemplates/%s/html/", getPath(), getLanguage());
 		$extraPath = detectExtraTemplatePath($template);;
 
-		////////////////////////
-		// Generate file name //
-		////////////////////////
+		// Generate FQFN
 		$FQFN = $basePath . $extraPath . $template . '.tpl';
 
 		// Does the special template exists?
@@ -322,7 +304,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
 			$ret = '';
 			if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== 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 //-->';
 
@@ -1092,10 +1074,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?
@@ -1258,12 +1240,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
@@ -1379,10 +1361,10 @@ function determinePageTitle () {
 		$pageTitle = '[-- ' . getMainTitle() . ' - ' . getModuleTitle(getModule()) . ' --]';
 	} elseif ((isInstalled()) && (!isAdminRegistered())) {
 		// Installed but no admin registered
-		$pageTitle = '{--SETUP_OF_MAILER--}';
+		$pageTitle = '{--INSTALLER_OF_MAILER_NO_ADMIN--}';
 	} elseif ((!isInstalled()) || (!isAdminRegistered())) {
 		// Installation mode
-		$pageTitle = '{--INSTALLATION_OF_MAILER--}';
+		$pageTitle = '{--INSTALLER_OF_MAILER--}';
 	} else {
 		// Configuration not found!
 		$pageTitle = '{--NO_CONFIG_FOUND_TITLE--}';
@@ -1500,7 +1482,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;
 
@@ -1685,5 +1667,43 @@ function fixNullEmptyToDashes ($str, $num) {
 	return $return;
 }
 
+//-----------------------------------------------------------------------------
+//                       Template Helper Functions
+//-----------------------------------------------------------------------------
+
+// Color-switch helper function
+function doTemplateColorSwitch ($template, $clear = false, $return = true) {
+	// Is it there?
+	if (!isset($GLOBALS['color_switch'][$template])) {
+		// Initialize it
+		initTemplateColorSwitch($template);
+	} elseif ($clear === false) {
+		// Switch color if called from loadTemplate()
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SWITCH:' . $template);
+		$GLOBALS['color_switch'][$template] = 3 - $GLOBALS['color_switch'][$template];
+	} // END - if
+
+	// Return CSS class name
+	if ($return === true) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'RETURN:' . $template . '=' . $GLOBALS['color_switch'][$template]);
+		return 'switch_sw' . $GLOBALS['color_switch'][$template];
+	} // END - if
+}
+
+// Helper function for extension registration link
+function doTemplateExtensionRegistrationLink ($template, $dummy, $ext_name) {
+	// Default is all productive
+	$OUT = '<a title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{%url=modules.php?module=admin&amp;what=extensions&amp;reg_ext=' . $ext_name . '%}">{--ADMIN_REGISTER_EXTENSION--}</a>';
+
+	// Is the given extension non-productive?
+	if (!isExtensionProductive($ext_name)) {
+		// Non-productive code
+		$OUT = '<em style="cursor:help" class="admin_note" title="{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE=' . $ext_name . '%}">{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}</em>';
+	} // END - if
+
+	// Return code
+	return $OUT;
+}
+
 // [EOF]
 ?>