X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=1fe104422b7b5b360dae7de3f87fbb9765ce28fe;hp=dac3329ac9f71e311291f2732944b78bf1e1d32f;hb=71c07e991fc7f5393317f4d9adf4ecdbc26b9aa3;hpb=fc62885f33ca2420975a7117ac9df9bf52082c21

diff --git a/inc/template-functions.php b/inc/template-functions.php
index dac3329ac9..1fe104422b 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,7 +180,7 @@ 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
 
@@ -226,7 +207,7 @@ function compileFinalOutput () {
 }
 
 // Main compilation loop
-function doFinalCompilation ($code, $insertComments = true) {
+function doFinalCompilation ($code, $insertComments = true, $enableCodes = true) {
 	// Insert comments? (Only valid with HTML templates, of course)
 	enableTemplateHtml($insertComments);
 
@@ -241,7 +222,7 @@ function doFinalCompilation ($code, $insertComments = true) {
 
 		// Compile it
 		//* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
-		$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
+		$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), false, true, $enableCodes)) . '";';
 		//* DEBUG: */ if (!$insertComments) print('<pre>'.linenumberCode($eval).'</pre>');
 		eval($eval);
 		//* DEBUG: */ die('<pre>'.encodeEntities($newContent).'</pre>');
@@ -299,9 +280,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 +301,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 //-->';
 
@@ -1191,8 +1170,8 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
 	$debug .= 'Please report this bug at <a title="Direct link to the bug-tracker" href="http://bugs.mxchange.org" rel="external" target="_blank">http://bugs.mxchange.org</a> and include the logfile from <strong>' . str_replace(getPath(), '', getCachePath()) . 'debug.log</strong> in your report (you can now attach files):<pre>';
 	$debug .= debug_get_printable_backtrace();
 	$debug .= '</pre>';
-	$debug .= '<div>Request-URI: ' . getRequestUri() . '</div>';
-	$debug .= '<div>Thank you for finding bugs.</div>';
+	$debug .= '<div class="para">Request-URI: ' . getRequestUri() . '</div>';
+	$debug .= '<div class="para">Thank you for finding bugs.</div>';
 
 	// Send an email? (e.g. not wanted for evaluation errors)
 	if (($sendEmail === true) && (!isInstallationPhase())) {
@@ -1379,10 +1358,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--}';
@@ -1536,7 +1515,7 @@ function sendModeMails ($mod, $modes) {
 					$sub_mem = '{--MEMBER_CHANGED_DATA--}';
 
 					// Output success message
-					$content = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
+					$content = '<span class="member_done">{--MEMBER_MYDATA_MAIL_SENT--}</span>';
 					break;
 
 				default: // Unsupported module!
@@ -1569,7 +1548,7 @@ function sendModeMails ($mod, $modes) {
 			$content = '{--CANNOT_SEND_ADMIN_MAILS--}';
 		} else {
 			// No mail to admin
-			$content = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
+			$content = '<span class="member_done">{--MEMBER_MYDATA_MAIL_SENT--}</span>';
 		}
 	} // END - if
 
@@ -1685,5 +1664,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]
 ?>