- remove triplle extension (.tpl.cache.php)

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 73bf31ae009e71fa23b505936d955bfd040e798f..5eb84e4339c5ddaa4c7e1ac22445426b55d4a9b7 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -859,7 +859,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
 
                case 'ho': // Hours
                        for ($idx = 0; $idx <= 23; $idx++) {
-                               $padded = padLeftZero($idx);
+                               $padded = padLeftZero($idx, 2);
                                $OUT .= '<option value="' . $padded . '"';
                                if ($default == $padded) $OUT .= ' selected="selected"';
                                $OUT .= '>' . $padded . '</option>';
@@ -869,7 +869,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
                case 'mi': // Minutes
                case 'se': // Seconds
                        for ($idx = 0; $idx <= 59; $idx+=5) {
-                               $padded = padLeftZero($idx);
+                               $padded = padLeftZero($idx, 2);
                                $OUT .= '<option value="' . $padded . '"';
                                if ($default == $padded) $OUT .= ' selected="selected"';
                                $OUT .= '>' . $padded . '</option>';
@@ -1497,8 +1497,8 @@ function generateExtensionInactiveNotInstalledMessage ($ext_name) {
                        break;
 
                default: // Should not happen!
-                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid state of extension %s detected.", $ext_name));
-                       $message = sprintf("Invalid state of extension %s detected.", $ext_name);
+                       logDebugMessage(__FUNCTION__, __LINE__, sprintf('Invalid state of extension %s detected.', $ext_name));
+                       $message = sprintf('Invalid state of extension %s detected.', $ext_name);
                        break;
        } // END - switch
 
@@ -1931,10 +1931,12 @@ function generateCacheFqfn ($prefix, $template) {
        if (!isset($GLOBALS['template_cache_fqfn'][$prefix][$template])) {
                // Generate the FQFN
                $GLOBALS['template_cache_fqfn'][$prefix][$template] = sprintf(
-                       '%s_compiled/%s/%s.tpl.cache',
+                       '%s%s_compiled/%s/%s%s',
+                       getPath(),
                        getCachePath(),
                        $prefix,
-                       $template
+                       $template,
+                       getCacheExtension()
                );
        } // END - if
 
@@ -1982,15 +1984,27 @@ function translateTimeUnit ($unit) {
 }
 
 // Displays given message in admin_settings_saved template
-function displayMessage ($message, $return = FALSE) {
+function displayMessage ($message) {
+       // Call inner function
+       outputHtml(returnMessage($message));
+}
+
+// Returns given message in admin_settings_saved template
+function returnMessage ($message) {
+       // Load the template
+       return loadTemplate('admin_settings_saved', TRUE, $message);
+}
+
+// Displays given error message in admin_settings_unsaved template
+function displayErrorMessage ($message) {
        // Load the template
-       return loadTemplate('admin_settings_saved', $return, $message);
+       outputHtml(returnErrorMessage($message));
 }
 
-// Displays given error message in admin_settings_saved template
-function displayErrorMessage ($message, $return = FALSE) {
+// Displays given error message in admin_settings_unsaved template
+function returnErrorMessage ($message) {
        // Load the template
-       return loadTemplate('admin_settings_unsaved', $return, $message);
+       return loadTemplate('admin_settings_unsaved', TRUE, $message);
 }
 
 // Generates a selection box for (maybe) given gender