X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=59e5aadb9fe4b3dcced24ef4df74112d454ddaae;hb=86081497645b595107b0f63afe186f6a5ee099df;hp=db267b113768e33b7e34ef9cd580f6a2b3e7226c;hpb=d2e72bd3391ac4513751d9c87fb2adf0238a611e;p=mailer.git
diff --git a/inc/template-functions.php b/inc/template-functions.php
index db267b1137..59e5aadb9f 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -17,7 +17,7 @@
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -70,13 +70,8 @@ function debugOutput ($message) {
// "Fixes" an empty string into three dashes (use for templates)
function fixEmptyContentToDashes ($str) {
- // Trim the string
- $str = trim($str);
-
- // Is the string empty?
- if (empty($str)) {
- $str = '---';
- } // END - if
+ // Call inner function
+ $str = fixNullEmptyToDashes($str, 3);
// Return string
return $str;
@@ -115,23 +110,32 @@ function outputHtml ($htmlCode, $newLine = true) {
outputRawCode($htmlCode);
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine === true) print("\n");
+ if ($newLine === true) {
+ print("\n");
+ } // END - if
} else {
// Render mode for old or lame servers...
$GLOBALS['output'] .= $htmlCode;
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine === true) $GLOBALS['output'] .= "\n";
+ if ($newLine === true) {
+ $GLOBALS['output'] .= "\n";
+ } // END - if
}
break;
case 'direct':
// If we are switching from render to direct output rendered code
- if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) { outputRawCode($GLOBALS['output']); $GLOBALS['output'] = ''; }
+ if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) {
+ outputRawCode($GLOBALS['output']);
+ $GLOBALS['output'] = '';
+ } // END - if
// The same as above... ^
outputRawCode($htmlCode);
- if ($newLine === true) print("\n");
+ if ($newLine === true) {
+ print("\n");
+ } // END - if
break;
default:
@@ -187,13 +191,13 @@ function compileFinalOutput () {
// Compress it?
/**
* @TODO On some pages this is buggy
- if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
+ if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (isInStringIgnoreCase('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']))) {
// Compress it for HTTP gzip
$GLOBALS['output'] = gzencode($GLOBALS['output'], 9);
// Add header
sendHeader('Content-Encoding: gzip');
- } elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
+ } elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (isInStringIgnoreCase('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']))) {
// Compress it for HTTP deflate
$GLOBALS['output'] = gzcompress($GLOBALS['output'], 9);
@@ -218,7 +222,7 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
$count = 0;
// Compile all out
- while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($count < 7)) {
+ while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== false)) && ($count < 7)) {
// Init common variables
$content = array();
$newContent = '';
@@ -240,10 +244,22 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
// Use it again
$code = $newContent;
+ // Compile the final code if insertComments is true
+ if ($insertComments == true) {
+ // ... because SQL queries shall keep OPEN_CONFIG and such in
+ $code = compileRawCode($code);
+ } // END - if
+
// Count round
$count++;
} // END - while
+ // Add debugging data in HTML code, if mode is enabled
+ if ((isDebugModeEnabled()) && ($insertComments === true)) {
+ // Add loop count
+ $code .= '';
+ } // END - if
+
// Return the compiled code
return $code;
}
@@ -307,16 +323,16 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
// Do we have to compile the code?
$ret = '';
- 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)) {
+ if ((isInString('$', $GLOBALS['tpl_content'][$template])) || (isInString('{--', $GLOBALS['tpl_content'][$template])) || (isInString('{?', $GLOBALS['tpl_content'][$template])) || (isInString('{%', $GLOBALS['tpl_content'][$template]))) {
// Normal HTML output?
- if (isHtmlOutputMode()) {
+ if ((isHtmlOutputMode()) && (substr($template, 0, 3) != 'js_')) {
// Add surrounding HTML comments to help finding bugs faster
$ret = '' . $GLOBALS['tpl_content'][$template] . '';
// Prepare eval() command
$GLOBALS['template_eval'][$template] = '$ret = "' . getColorSwitchCode($template) . compileCode(escapeQuotes($ret), false, true, true, $compileCode) . '";';
} elseif (substr($template, 0, 3) == 'js_') {
- // JavaScripts don't like entities and timings
+ // JavaScripts don't like entities, dollar signs and timings
$GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'][$template]), false, true, true, $compileCode) . '");';
} else {
// Prepare eval() command, other output doesn't like entities, maybe
@@ -333,7 +349,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
// Only admins shall see this warning or when installation mode is active
$ret = '
- {--TEMPLATE_404--}
+ {--TEMPLATE_404--}
(' . $template . ')
@@ -425,9 +441,7 @@ function detectExtraTemplatePath ($template) {
}
// Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadUserData = true) {
- global $DATA;
-
+function loadEmailTemplate ($template, $content = array(), $userid = NULL, $loadUserData = true) {
// Make sure all template names are lowercase!
$template = strtolower($template);
@@ -508,8 +522,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
{--TEMPLATE_CONTENT--}:
' . print_r($content, true) . '
- {--TEMPLATE_DATA--}:
-
' . print_r($DATA, true) . '
';
// Debug mode not active? Then remove the HTML tags
@@ -533,7 +545,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
// Remove content and data
unset($content);
- unset($DATA);
// Return content
return $newContent;
@@ -545,7 +556,9 @@ function getMenuCssClasses ($data) {
$content = explode('|', $data);
// Non-existent index 2 will happen in menu blocks
- if (!isset($content[2])) $content[2] = '';
+ if (!isset($content[2])) {
+ $content[2] = '';
+ } // END - if
// Re-construct the array: 0=visible,1=locked,2=prefix
$content['visible'] = $content[0];
@@ -560,7 +573,7 @@ function getMenuCssClasses ($data) {
// Generate XHTML code for the CAPTCHA
function generateCaptchaCode ($code, $type, $type, $userid) {
- return '';
+ return '';
}
// Compiles the given HTML/mail code
@@ -590,7 +603,7 @@ function compileCode ($code, $simple = false, $constants = true, $full = true, $
return $code;
}
-// Compiles the code (use compileCode() only for HTML because of the comments)
+// Compiles the code
// @TODO $simple/$constants are deprecated
function compileRawCode ($code, $simple = false, $constants = true, $full = true, $compileCode = true) {
// Is the code a string or shall we not compile?
@@ -617,8 +630,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
$code = str_replace($secChars['to'], $secChars['from'], $code);
// Find $content[bla][blub] entries
- // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
- preg_match_all('/\$(content|GLOBALS|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
+ preg_match_all('/\$content((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
// Are some matches found?
if ((count($matches) > 0) && (count($matches[0]) > 0)) {
@@ -644,21 +656,26 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
} // END - foreach
// Skip this entry?
- if ($fuzzyFound === true) continue;
+ if ($fuzzyFound === true) {
+ continue;
+ } // END - if
// Take all string elements
- if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key.'_' . $matches[4][$key]]))) {
+ if ((is_string($matches[3][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key.'_' . $matches[3][$key]]))) {
// Replace it in the code
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',match=' . $match);
$newMatch = str_replace('[', "['", str_replace(']', "']", $match));
$code = str_replace($match, '".' . $newMatch . '."', $code);
- $matchesFound[$key . '_' . $matches[4][$key]] = 1;
- $matchesFound[$match] = 1;
+ $matchesFound[$key . '_' . $matches[3][$key]] = 1;
+ $matchesFound[$match] = true;
} elseif (!isset($matchesFound[$match])) {
// Not yet replaced!
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match);
$code = str_replace($match, '".' . $match . '."', $code);
$matchesFound[$match] = 1;
+ } else {
+ // Everthing else should be a least logged
+ logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match . ',key=' . $key);
}
} // END - foreach
} // END - if
@@ -836,15 +853,11 @@ function generateImageOrCode ($img_code, $headerSent = true) {
}
// Create selection box or array of splitted timestamp
-function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $return_array=false) {
+function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $asArray = false) {
// Do not continue if ONE_DAY is absend
if (!isConfigEntrySet('ONE_DAY')) {
- // And return the timestamp itself or empty array
- if ($return_array === true) {
- return array();
- } else {
- return $timestamp;
- }
+ // Abort here
+ debug_report_bug(__FUNCTION__, __LINE__, 'Configuration entry ONE_DAY is absend. timestamp=' . $timestamp . ',prefix=' . $prefix . ',align=' . $align . ',asArray=' . intval($asArray));
} // END - if
// Calculate 2-seconds timestamp
@@ -893,16 +906,16 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
//
// Now we convert them in seconds...
//
- if ($return_array) {
+ if ($asArray === true) {
// Just put all data in an array for later use
$OUT = array(
- 'YEARS' => $Y,
- 'MONTHS' => $M,
- 'WEEKS' => $W,
- 'DAYS' => $D,
- 'HOURS' => $h,
- 'MINUTES' => $m,
- 'SECONDS' => $s
+ 'Y' => $Y,
+ 'M' => $M,
+ 'W' => $W,
+ 'D' => $D,
+ 'h' => $h,
+ 'm' => $m,
+ 's' => $s
);
} else {
// Generate table
@@ -911,31 +924,31 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
$OUT .= '