This should display the data?

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index c301e9fd403dc54eb4c817c287be33d4cd500b91..25f31b3e88255cc478c2d979efb0ede3371ee4fd 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -171,7 +171,7 @@ function outputHtml ($htmlCode, $newLine = true) {
                outputRawCode($GLOBALS['output']);
        } else {
                // And flush all headers
-               flushHeaders();
+               flushHttpHeaders();
        }
 }
 
@@ -196,21 +196,21 @@ function compileFinalOutput () {
                $GLOBALS['output'] = gzencode($GLOBALS['output'], 9);
 
                // Add header
-               sendHeader('Content-Encoding: gzip');
+               addHttpHeader('Content-Encoding: gzip');
        } elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (isInStringIgnoreCase('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']))) {
                // Compress it for HTTP deflate
                $GLOBALS['output'] = gzcompress($GLOBALS['output'], 9);
 
                // Add header
-               sendHeader('Content-Encoding: deflate');
+               addHttpHeader('Content-Encoding: deflate');
        }
        */
 
        // Add final length
-       sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
+       addHttpHeader('Content-Length: ' . strlen($GLOBALS['output']));
 
        // Flush all headers
-       flushHeaders();
+       flushHttpHeaders();
 }
 
 // Main compilation loop
@@ -278,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;
 
@@ -297,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);
@@ -322,7 +323,6 @@ 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()) && (substr($template, 0, 3) != 'js_')) {
@@ -461,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
@@ -478,7 +479,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
                }
 
                // Merge data if valid
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'content()=' . count($content) . ' - PRE!');
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'content()=' . count($content) . ' - BEFORE!');
                if ((isUserDataValid()) && ($loadUserData === true)) {
                        // It is valid
                        $content = merge_array($content, getUserDataArray());
@@ -540,7 +541,10 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
                $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'][$template];
 
                // Add last error if the required function exists
-               if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
+               if (function_exists('error_get_last')) {
+                       // Add last error and some lines for better overview
+                       $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
+               } // END - if
        } // END - if
 
        // Remove content and data