Better only check on daily reset

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3bd31a9dc458cbed32febd25ceb3b0817d81507e..474a86baf0885cbcfce5f6bad0c3de1e2a7d2dda 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -829,6 +829,14 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
                        } // END - for
                        break;
 
+               case 'mn': // Months, numeric
+                       for ($idx = 0; $idx <= 12; $idx++) {
+                               $OUT .= '<option value="' . $idx . '"';
+                               if ($default == $idx) $OUT .= ' selected="selected"';
+                               $OUT .= '>{%pipe,padLeftZero=' . $idx . '%}</option>';
+                       } // END - for
+                       break;
+
                case 'we': // Weeks
                        for ($idx = 0; $idx <= 4; $idx++) {
                                $OUT .= '  <option value="' . $idx . '"';
@@ -838,15 +846,15 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
                        break;
 
                case 'da': // Days
-                       for ($idx = 0; $idx < 32; $idx++) {
+                       for ($idx = 0; $idx <= 31; $idx++) {
                                $OUT .= '<option value="' . $idx . '"';
                                if ($default == $idx) $OUT .= ' selected="selected"';
-                               $OUT .= '>' .padLeftZero($idx) . '</option>';
+                               $OUT .= '>{%pipe,padLeftZero=' . $idx . '%}</option>';
                        } // END - for
                        break;
 
                case 'ho': // Hours
-                       for ($idx = 0; $idx < 24; $idx++) {
+                       for ($idx = 0; $idx <= 23; $idx++) {
                                if (strlen($idx) == 1) $idx = 0 . $idx;
                                $OUT .= '<option value="' . $idx . '"';
                                if ($default == $idx) $OUT .= ' selected="selected"';
@@ -856,7 +864,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
 
                case 'mi': // Minutes
                case 'se': // Seconds
-                       for ($idx = 0; $idx < 60; $idx+=5) {
+                       for ($idx = 0; $idx <= 59; $idx+=5) {
                                if (strlen($idx) == 1) $idx = 0 . $idx;
                                $OUT .= '<option value="' . $idx . '"';
                                if ($default == $idx) $OUT .= ' selected="selected"';
@@ -1009,7 +1017,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
                        // Time unit -> field name
                        'unit_field' => array(
                                'Y' => 'ye',
-                               'M' => 'mo',
+                               'M' => 'mn',
                                'W' => 'we',
                                'D' => 'da',
                                'h' => 'ho',
@@ -2278,7 +2286,7 @@ function anonymizeSensitiveData ($data) {
                if (isAdmin()) {
                        // Is admin, has always priority
                        $data = '[<a href="{%pipe,generateFrametesterUrl=' . $data . '%}" target="_blank">{--ADMIN_TEST_URL--}</a>]';
-               } elseif (isUrlBlacklisted($data)) {
+               } elseif ((isExtensionActive('blacklist')) && (isUrlBlacklisted($data))) {
                        // Yes, so replace it with text
                        $data = '<em>{--URL_IS_BLACKLISTED--}</em>';
                } else {