X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=fca55228928da38153439dff3963d80f4bde6dcc;hb=ccd86939ba30aba70497c73264333f2fe4d786e8;hp=3025bff9389b17c779dd76468800e65707632eda;hpb=0a37fc5afcd828646d4e62e68fea07c3d2c54a87;p=mailer.git
diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3025bff938..fca5522892 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -110,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:
@@ -269,14 +278,18 @@ function outputRawCode ($htmlCode) {
// Load a template file and return it's content (only it's name; do not use ' or ")
function loadTemplate ($template, $return = false, $content = array(), $compileCode = true) {
+ // @TODO Remove these sanity checks if all is fine
if (!is_bool($return)) {
- // @TODO Remove this sanity-check if all is fine
+ // $return has to be boolean
debug_report_bug(__FUNCTION__, __LINE__, 'return[] is not bool (' . gettype($return) . ')');
} elseif (!is_string($template)) {
// $template has to be string
debug_report_bug(__FUNCTION__, __LINE__, 'template[] is not string (' . gettype($template) . ')');
}
+ // Init returned content
+ $ret = '';
+
// Set current template
$GLOBALS['current_template'] = $template;
@@ -288,9 +301,6 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
// Make all template names lowercase
$template = strtolower($template);
- // Init some data
- $ret = '';
-
// Base directory
$basePath = sprintf("%stemplates/%s/html/", getPath(), getLanguage());
$extraPath = detectExtraTemplatePath($template);
@@ -313,17 +323,16 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
$GLOBALS['tpl_content'][$template] = readFromFile($FQFN);
// Do we have to compile the code?
- $ret = '';
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
@@ -340,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 . ')
@@ -452,6 +461,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
} // END - if
// Load user's data
+ // @DEPRECATED Loading the user data by given userid is deprecated because it is not related to template loading
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UID=' . $userid . ',template=' . $template . ',content[]=' . gettype($content));
if ((isValidUserId($userid)) && (is_array($content))) {
// If nickname extension is installed, fetch nickname as well
@@ -547,7 +557,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];
@@ -562,7 +574,7 @@ function getMenuCssClasses ($data) {
// Generate XHTML code for the CAPTCHA
function generateCaptchaCode ($code, $type, $type, $userid) {
- return '';
+ return '';
}
// Compiles the given HTML/mail code
@@ -898,13 +910,13 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
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
@@ -913,31 +925,31 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
$OUT .= '