Renamed a lot language strings to new naming convention, first english translation...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index e07307acb584b51404c1ecd3a9d6b2de1ebd226f..bf192a5fb7917c2681401374ed201350e49e8383 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1523,13 +1523,13 @@ function getMessageFromErrorCode ($code) {
                        $content['timestamp'] = generateDateTime($content['timestamp'], 1);
 
                        // Calculate hours...
-                       $content['hours'] = round(getConfig('url_tlock') / 60 / 60);
+                       $content['hours'] = round(getUrlTlock() / 60 / 60);
 
                        // Minutes...
-                       $content['minutes'] = round((getConfig('url_tlock') - $content['hours'] * 60 * 60) / 60);
+                       $content['minutes'] = round((getUrlTlock() - $content['hours'] * 60 * 60) / 60);
 
                        // And seconds
-                       $content['seconds'] = round(getConfig('url_tlock') - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
+                       $content['seconds'] = round(getUrlTlock() - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
 
                        // Finally contruct the message
                        $message = loadTemplate('tlock_message', true, $content);
@@ -1921,11 +1921,11 @@ function addNewBonusMail ($data, $mode = '', $output = true) {
 
                // Mail inserted into bonus pool
                if ($output === true) {
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_SEND--}');
+                       displayMessage('{--ADMIN_BONUS_SEND--}');
                } // END - if
        } elseif ($output === true) {
                // More entered than can be reached!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_MORE_SELECTED--}');
+               displayMessage('{--ADMIN_MORE_SELECTED--}');
        } else {
                // Debug log
                logDebugMessage(__FUNCTION__, __LINE__, 'cat=' . $data['cat'] . ',receiver=' . $data['receiver'] . ',data=' . base64_encode(serialize($data)) . ' More selected, than available!');
@@ -2005,6 +2005,15 @@ function doReset () {
        runFilterChain('reset');
 }
 
+// Enables the reset mode (hourly, weekly and monthly) and runs it
+function doHourly () {
+       // Enable the hourly reset mode
+       $GLOBALS['hourly_enabled'] = true;
+
+       // Run filters (one always!)
+       runFilterChain('hourly');
+}
+
 // Our shutdown-function
 function shutdown () {
        // Call the filter chain 'shutdown'