Major cleanup of old-school HTML-mess...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 3699d4ea8f4dfeb29a015fa48801bd18024464cb..0dbe4ae0d2d9d5a42584d474a7022b02888eda26 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1648,10 +1648,9 @@ function createFancyTime ($stamp) {
 
 // Generates a navigation row for listing emails
 function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) {
-       $SEP = ''; $TOP = '';
+       $TOP = '';
        if ($show_form === false) {
                $TOP = " top";
-               $SEP = "<tr><td colspan=\"" . $colspan."\" class=\"seperator\">&nbsp;</td></tr>";
        }
 
        $NAV = '';
@@ -1687,7 +1686,6 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
        $content['nav']  = $NAV;
        $content['span'] = $colspan;
        $content['top']  = $TOP;
-       $content['sep']  = $SEP;
 
        // Load navigation template
        $OUT = loadTemplate('admin_email_nav_row', true, $content);
@@ -3685,7 +3683,7 @@ function isTemplateCached ($template) {
        // Do we have cached this result?
        if (!isset($GLOBALS['template_cache'][$template])) {
                // Generate FQFN
-               $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+               $FQFN = generateCacheFqfn($template);
 
                // Is it there?
                $GLOBALS['template_cache'][$template] = isFileReadable($FQFN);
@@ -3700,7 +3698,7 @@ function flushTemplateCache ($template, $eval) {
        // Is this cache flushed?
        if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template) === false) && ($eval != '404')) {
                // Generate FQFN
-               $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+               $FQFN = generateCacheFqfn($template);
 
                // Replace username with a call
                $eval = str_replace('$username', '".getUsername()."', $eval);
@@ -3715,7 +3713,7 @@ function readTemplateCache ($template) {
        // Check it again
        if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) {
                // Generate FQFN
-               $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+               $FQFN = generateCacheFqfn($template);
 
                // And read from it
                $GLOBALS['template_eval'][$template] = readFromFile($FQFN);
@@ -4017,6 +4015,18 @@ function generateMetaDescriptionCode () {
        unset($GLOBALS['ref_level']);
 }
 
+// Generates an FQFN for template cache from the given template name
+function generateCacheFqfn ($template) {
+       // Is this cached?
+       if (!isset($GLOBALS['template_cache_fqfn'][$template])) {
+               // Generate the FQFN
+               $GLOBALS['template_cache_fqfn'][$template] = sprintf("%s_compiled/html/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
+       } // END - if
+
+       // Return it
+       return $GLOBALS['template_cache_fqfn'][$template];
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
@@ -4031,7 +4041,7 @@ if (!function_exists('html_entity_decode')) {
 } // END - if
 
 if (!function_exists('http_build_query')) {
-       // Taken from documentation on www.php.net, credits to Marco K. (Germany)
+       // Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
        function http_build_query($data, $prefix = '', $sep = '', $key = '') {
                $ret = array();
                foreach ((array)$data as $k => $v) {
@@ -4039,7 +4049,7 @@ if (!function_exists('http_build_query')) {
                                $k = urlencode($prefix . $k);
                        } // END - if
 
-                       if ((!empty($key)) || ($key === 0))  $k = $key.'['.urlencode($k).']';
+                       if ((!empty($key)) || ($key === 0))  $k = $key . '[' . urlencode($k) . ']';
 
                        if (is_array($v) || is_object($v)) {
                                array_push($ret, http_build_query($v, '', $sep, $k));