X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=d96bfb73958aba1460208f8337006826b333912b;hb=78ea4fb68499daac3c709245842bfd9402a248be;hp=dac3329ac9f71e311291f2732944b78bf1e1d32f;hpb=fc62885f33ca2420975a7117ac9df9bf52082c21;p=mailer.git
diff --git a/inc/template-functions.php b/inc/template-functions.php
index dac3329ac9..d96bfb7395 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']));
@@ -226,7 +210,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,9 +225,10 @@ function doFinalCompilation ($code, $insertComments = true) {
// Compile it
//* DEBUG: */ debugOutput(''.linenumberCode($code).'
');
- $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
- //* DEBUG: */ if (!$insertComments) print(''.linenumberCode($eval).'
');
+ $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), false, true, $enableCodes)) . '";';
+ //* DEBUG: */ if (!$insertComments) print('EVAL='.linenumberCode($eval).'
');
eval($eval);
+ //* DEBUG: */ if (!$insertComments) print('NEW='.linenumberCode($newContent).'
');
//* DEBUG: */ die(''.encodeEntities($newContent).'
');
// Was that eval okay?
@@ -299,9 +284,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 +305,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 = '' . $GLOBALS['tpl_content'] . '';
@@ -1092,10 +1075,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?
@@ -1147,7 +1130,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
@@ -1191,8 +1176,8 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
$debug .= 'Please report this bug at http://bugs.mxchange.org and include the logfile from ' . str_replace(getPath(), '', getCachePath()) . 'debug.log in your report (you can now attach files):';
$debug .= debug_get_printable_backtrace();
$debug .= '
';
- $debug .= 'Request-URI: ' . getRequestUri() . '
';
- $debug .= 'Thank you for finding bugs.
';
+ $debug .= 'Request-URI: ' . getRequestUri() . '
';
+ $debug .= 'Thank you for finding bugs.
';
// Send an email? (e.g. not wanted for evaluation errors)
if (($sendEmail === true) && (!isInstallationPhase())) {
@@ -1258,12 +1243,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 +1364,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 +1485,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;
@@ -1536,7 +1521,7 @@ function sendModeMails ($mod, $modes) {
$sub_mem = '{--MEMBER_CHANGED_DATA--}';
// Output success message
- $content = '{--MYDATA_MAIL_SENT--}';
+ $content = '{--MEMBER_MYDATA_MAIL_SENT--}';
break;
default: // Unsupported module!
@@ -1569,7 +1554,7 @@ function sendModeMails ($mod, $modes) {
$content = '{--CANNOT_SEND_ADMIN_MAILS--}';
} else {
// No mail to admin
- $content = '{--MYDATA_MAIL_SENT--}';
+ $content = '{--MEMBER_MYDATA_MAIL_SENT--}';
}
} // END - if
@@ -1685,5 +1670,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 = '{--ADMIN_REGISTER_EXTENSION--}';
+
+ // Is the given extension non-productive?
+ if (!isExtensionProductive($ext_name)) {
+ // Non-productive code
+ $OUT = '{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}';
+ } // END - if
+
+ // Return code
+ return $OUT;
+}
+
// [EOF]
?>