More wrapper functions introduced, duplicate language strings merged:

- Some duplicate language strings merged
- More wrapper functions for configuration entries introduced
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 0404331a79c3783b96a28e8aa77cc9d06f264759..f513476b8ab77816d2a3166815944ebdeaeb87c6 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -182,8 +182,8 @@
 ./inc/mysql-manager.php:1959:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:368:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
-./inc/reset/reset_beg.php:49:// @TODO This should be converted in a daily beg rallye
-./inc/reset/reset_birthday.php:89:                     // @TODO 4 is hard-coded here, should we move it out in config?
+./inc/reset/reset_beg.php:52:// @TODO This should be converted in a daily beg rallye
+./inc/reset/reset_birthday.php:92:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array'
 ./inc/template-functions.php:1044:                     // @TODO Deprecate this thing
 ./inc/template-functions.php:1055:                     // @TODO Deprecate this thing

diff --git a/inc/filters.php b/inc/filters.php
index 5c538afb2a18aec4d0c1fb4cd54c6fb1f29066d4..0b07e67b7eec01c714a4e8d4944ab105e3c5f55b 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -580,7 +580,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                $currMonth = getMonth();
 
                // Has it changed?
-               if ((getConfig('last_month') != $currMonth) || (isMonthlyResetDebugEnabled())) {
+               if ((getLastMonth() != $currMonth) || (isMonthlyResetDebugEnabled())) {
                        // Include monthly reset scripts
                        mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 

diff --git a/inc/language/other_de.php b/inc/language/other_de.php
index 8bb3e33eac3f22eac756db33e48662f13f68524a..c24bcd8949c214ab209ab5d23e37aa35a44f6cf6 100644 (file)
--- a/inc/language/other_de.php
+++ b/inc/language/other_de.php
@@ -63,18 +63,14 @@ addMessages(array(
        'ADMIN_OPTION_POINTS_WORD' => "Währung Ihres Tausches (Klammlose, Wernis, Primera, FuCo, etc.)",
        'ADMIN_OPTION_MAX_COMMA' => "Angezeigte Stellen hinter dem Komma",
        'ADMIN_OPTION_CSS_PHP' => "Sollen die CSS-Dateien direkt ausgegeben werden oder von css.php angezeigt werden?",
-       'ADMIN_CSS_PHP_DIRECT' => "Per <link>-Tag ausgeben (Debug!)",
-       'ADMIN_CSS_PHP_FILE' => "Per css.php ausgeben (<strong>empfohlen</strong>)",
-       'ADMIN_CSS_PHP_INLINE' => "In &lt;style&gt;-Tag eingeschlossen ausgeben (Debug!)",
+       'ADMIN_SELECT_CSS_OUTPUT_MODE_DIRECT' => "Per &lt;link&gt;-Tag ausgeben (Debug!)",
+       'ADMIN_SELECT_CSS_OUTPUT_MODE_FILE' => "Per css.php ausgeben",
+       'ADMIN_SELECT_CSS_OUTPUT_MODE_INLINE' => "In &lt;style&gt;-Tag ausgeben",
        'ADMIN_OPTION_GUEST_MENU' => "Gastmen&uuml; ein-/ausblenden",
        'ADMIN_OPTION_MEMBER_MENU' => "Mitgliedsmen&uuml; ein-/ausblenden",
        'ADMIN_OPTION_YOURE_HERE' => "Navigation &quot;Sie sind hier&quot; ein-/ausblenden",
-       'ADMIN_GUEST_MENU_ACTIVE' => "Einblenden",
-       'ADMIN_GUEST_MENU_INACTIVE' => "Ausblenden",
-       'ADMIN_MEMBER_MENU_ACTIVE' => "Einblenden",
-       'ADMIN_MEMBER_MENU_INACTIVE' => "Ausblenden",
-       'ADMIN_YOURE_HERE_ACTIVE' => "Einblenden",
-       'ADMIN_YOURE_HERE_INACTIVE' => "Ausblenden",
+       'ADMIN_IS_SHOWN' => "Einblenden",
+       'ADMIN_IS_NOT_SHOWN' => "Ausblenden",
        'ADMIN_OPTION_MT_WORD' => "Art Ihres Tausches (1. Fall)",
        'ADMIN_OPTION_MT_WORD2' => "Art Ihres Tausches (2. Fall)",
        'ADMIN_OPTION_MT_WORD3' => "Art Ihres Tausches (1. Fall, Plural)",

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index f6e2a9b52660b05d329474bbfdb4eca16a63441a..5a26daa3791490793cd142b1faeaefb0ee87b21c 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 if (!isHtmlOutputMode()) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 371e0b621bf28d98ee9370379d9f9d42fb6c1720..d1a9ff84f04fe262c06ada7e962dda1bd97dd164 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 if (!isHtmlOutputMode()) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 2f2aece4440743ba9c5b40cb0ca62cddd3d7db30..b11bba4848c735d636622dc02ecb4bd316865288 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -108,7 +108,7 @@ ORDER BY
                $content['total'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
-               if (getConfig('last_month') == getMonth()) {
+               if (getLastMonth() == getMonth()) {
                        // Load form
                        $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
                } else {

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 37d9fe196fac1186cc8e8ce78742198ff0401257..cdc608bcf445c0672376caecc21002538408d7c5 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -120,7 +120,7 @@ ORDER BY
                $content['total'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
-               if (getConfig('last_month') == getMonth()) {
+               if (getLastMonth() == getMonth()) {
                        // Load form
                        $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true);
                } else {

diff --git a/inc/monthly/monthly_ b/inc/monthly/monthly_
index feed29db628480e676c1e5d8f4ca7d74b1da196c..20811698f90f7f90cbb2b7da053214c42929c0b5 100644 (file)
--- a/inc/monthly/monthly_
+++ b/inc/monthly/monthly_
@@ -46,7 +46,13 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
+
 // Do your monthly-reset things here
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 6a557df326b58133511e741c9413056e1acf9aae..34fa872965644e9aa84473d3e078cc6a74b28ff6 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -46,11 +46,11 @@ if (!defined('__SECURITY')) {
        return;
 }
 
-// Get current month (2 digits)
-$curr = getMonth();
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (!isCssOutputMode())) {
+if ((getConfig('beg_ranks') > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = '';
 
@@ -101,5 +101,8 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
        SQL_FREERESULT($result_main);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 1b746af267666e101d90ba5e1802398569a52c5b..acbe511eece9fd43816d51104c6b4aa4b98feeba 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -46,10 +46,10 @@ if (!defined('__SECURITY')) {
        return;
 }
 
-// Get current month (2 digits)
-$curr = getMonth();
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
+if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";
 
@@ -116,5 +116,8 @@ SET
        SQL_FREERESULT($result_main);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 1911913acf91778aa68bbc601dab9eb759d6e1f9..fc0796e9a65899cc7f446040eec4195b6bdcff51 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -46,5 +46,11 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/monthly/monthly_surfbar.php b/inc/monthly/monthly_surfbar.php
index c69dc5a428eea9408bf074dbf87dd268a2c0e2ea..254c6d4fab981aa423bef9365506822d1682cf61 100644 (file)
--- a/inc/monthly/monthly_surfbar.php
+++ b/inc/monthly/monthly_surfbar.php
@@ -46,8 +46,14 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
+
 // Reset surfbar counter
 updateConfiguration('surfbar_monthly_counter', 0);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_ b/inc/reset/reset_
index ae17de0b1072d356888d0a045fe5e226dc3ef74b..cc983a3029ed33835f4b99b91f0cf5eb10b13b10 100644 (file)
--- a/inc/reset/reset_
+++ b/inc/reset/reset_
@@ -46,5 +46,11 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index 55933843d7de259b0afa78a6786081ef8100afac..265388459af8f4b4c8fb74dc6287709f57655e31 100644 (file)
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -46,6 +46,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Check for 100% klickrate mails
 $result_bonus = SQL_QUERY("SELECT
        `id`, `userid`, `subject`, `timestamp_ordered`, `clicks`, `url`
@@ -84,5 +87,8 @@ if (!SQL_HASZERONUMS($result_bonus)) {
 // Free memory
 SQL_FREERESULT($result_bonus);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_autopurge.php b/inc/reset/reset_autopurge.php
index 948f36fc45d1469e03de6d4b130cb70ce21bbf71..518d3601e4d6398e73d3b5e7ad9698f3d1a8edc2 100644 (file)
--- a/inc/reset/reset_autopurge.php
+++ b/inc/reset/reset_autopurge.php
@@ -46,6 +46,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Init & set the include pool
 initIncludePool('autopurge');
 setIncludePool('autopurge', getArrayFromDirectory('inc/autopurge/', 'purge-'));
@@ -56,5 +59,8 @@ runFilterChain('load_includes', 'autopurge');
 // Run filters for extra autopurge
 runFilterChain('extra_autopurge');
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_beg.php b/inc/reset/reset_beg.php
index 3780c0996e4e898dafb5a1c53cb3c037a8c8d852..05c56e0708fe15d159fed8b46a27098e12f827d9 100644 (file)
--- a/inc/reset/reset_beg.php
+++ b/inc/reset/reset_beg.php
@@ -46,7 +46,13 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // @TODO This should be converted in a daily beg rallye
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index dc3f70660a635dd05f8aa3822855f840e6cf6b8e..b194ef628f45829cf204e1632717a28b04bf337d 100644 (file)
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -46,6 +46,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Get current day (01 to 31), month (01 to 12) and year (4-digits year)
 $day   = getDay();
 $month = getMonth();
@@ -88,7 +91,7 @@ if (!SQL_HASZERONUMS($result_birthday)) {
 
                        // @TODO 4 is hard-coded here, should we move it out in config?
                        for ($idx = '0'; $idx < 4; $idx++) {
-                               $content['check'] .= generateRandomCode('8', mt_rand(0, $month.$day), $content['userid'], ($age * ($idx + 1)));
+                               $content['check'] .= generateRandomCode('8', mt_rand(0, $month . $day), $content['userid'], ($age * ($idx + 1)));
                        } // END - for
 
                        // Insert row into database
@@ -117,5 +120,8 @@ if (!SQL_HASZERONUMS($result_birthday)) {
        SQL_FREERESULT($result_birthday);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_bonus.php b/inc/reset/reset_bonus.php
index 38d97091fb96b7b494bca0988473ae7c065ab5d3..cb36ff75d57a122a952101bf21dc54fb61fb7842 100644 (file)
--- a/inc/reset/reset_bonus.php
+++ b/inc/reset/reset_bonus.php
@@ -46,6 +46,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Purge expired entries in _bonus_turbo
 purgeExpiredTurboBonus();
 
@@ -60,5 +63,8 @@ SET
        `bonus_ref`=0',
        __FILE__, __LINE__);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index d033e12db7abf952e6244b1300b4d7434197468d..02b19d73f955b46c133ac856d0aee7d7630fbfbc 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -46,6 +46,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Update user profiles
 if (isExtensionInstalledAndNewer('order', '0.1.1')) {
        // Latest version
@@ -139,5 +142,8 @@ LIMIT 1",
 // Free memory
 SQL_FREERESULT($result_daily);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_doubler.php b/inc/reset/reset_doubler.php
index 4d9d8db77b44d4059d89fa8af65e1fc0746abff5..8fc2f1028df398d3612ee187a9dc8d5c89bba2fb 100644 (file)
--- a/inc/reset/reset_doubler.php
+++ b/inc/reset/reset_doubler.php
@@ -46,8 +46,14 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Include it
 loadIncludeOnce('inc/mails/doubler_mails.php');
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_engine.php b/inc/reset/reset_engine.php
index 69a979cb6c48944a41122dc95cf4692684e758e0..e4a970f03fa4134f8709468f658821a14c7d64b2 100644 (file)
--- a/inc/reset/reset_engine.php
+++ b/inc/reset/reset_engine.php
@@ -46,5 +46,11 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 33689d69dec2932dd7ea432183153a087bb04fe3..a4a9f316bc424ad2cb0aa9a5ed1aa3a2b4eb8799 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -46,6 +46,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Check for holidays we need to enable and send email to user
 $result_main = SQL_QUERY("SELECT
        `userid`, `holiday_activated`
@@ -119,5 +122,8 @@ SQL_FREERESULT($result_main);
 // Stop currently activated holidays
 stopHolidays();
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 1dfe8c6aed02cf30a1734dc231425ae7d802bde6..5507e0aa42b391a4287186e17d43949035ff195c 100644 (file)
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -47,6 +47,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
        // Load personal data
        $result = SQL_QUERY("SELECT
@@ -97,5 +100,8 @@ ORDER BY
        SQL_FREERESULT($result);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_surfbar.php b/inc/reset/reset_surfbar.php
index 459d6f193d7a7c1a89ce2051da9ff91c06d224ee..758fcabe2d81a12c4052ef1b356264f14c8ff16a 100644 (file)
--- a/inc/reset/reset_surfbar.php
+++ b/inc/reset/reset_surfbar.php
@@ -46,10 +46,16 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Reset surfbar counter
 updateConfiguration(array('surfbar_daily_counter', 'surfbar_yester_counter'), array(0, getConfig('surfbar_daily_counter')));
 setConfigEntry('surfbar_yester_counter', getConfig('surfbar_daily_counter'));
 setConfigEntry('surfbar_daily_counter' , 0);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/reset/reset_yoomedia.php b/inc/reset/reset_yoomedia.php
index 39417c9a7175c9e4d2a6e78768cc6f71bb4b6287..8a22f74bbace3f8120bbdfabcdbac8d11774a827 100644 (file)
--- a/inc/reset/reset_yoomedia.php
+++ b/inc/reset/reset_yoomedia.php
@@ -46,8 +46,14 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 // Simply reset the requests here
 updateConfiguration('yoomedia_requests_remain', getConfig('yoomedia_requests_total'));
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/weekly/weekly_ b/inc/weekly/weekly_
index 584015acd45ed6aeba832318c7e64ba3f323ad92..ee762ac01f9a453d6d3984292bdd374b100a731a 100644 (file)
--- a/inc/weekly/weekly_
+++ b/inc/weekly/weekly_
@@ -46,7 +46,13 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Weekly reset started.');
+
 // Start your weekly-reset things here
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Weekly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/weekly/weekly_surfbar.php b/inc/weekly/weekly_surfbar.php
index 70e64eb7f3a18b7bcfa846c3b2cc4b564cc52dd5..eeaeea8bd8c38400d6ab5c20af19f991d2ae2284 100644 (file)
--- a/inc/weekly/weekly_surfbar.php
+++ b/inc/weekly/weekly_surfbar.php
@@ -46,8 +46,14 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Weekly reset started.');
+
 // Reset the surfbar counter
 updateConfiguration('surfbar_weekly_counter', 0);
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Weekly reset ended.');
+
 // [EOF]
 ?>

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index afd6a25b19b6e54dea2cb7ea70bdc306b7656d16..4c3e4a8c0e835c630b338c1dc3677e731c6ae04a 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1934,6 +1934,18 @@ function getAdminMenu () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for last_month
+function getLastMonth () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('last_month');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
        // Do we have cache?

diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl
index c86e8dc21395ee35497c66ce949bbd61899958e7..bf170f398d8bd07278a78332f2c11ead7b9a1b32 100644 (file)
--- a/templates/de/html/admin/admin_config_other.tpl
+++ b/templates/de/html/admin/admin_config_other.tpl
@@ -86,33 +86,33 @@
        <tr>
                <td align="right">{--ADMIN_OPTION_CSS_PHP--}:</td>
                <td>
-                       <input type="radio" class="form_field" name="css_php" value="DIRECT"$content[css_php_direct] /> {--ADMIN_CSS_PHP_DIRECT--}<br />
-                       <input type="radio" class="form_field" name="css_php" value="FILE"$content[css_php_file] /> {--ADMIN_CSS_PHP_FILE--}<br />
-                       <input type="radio" class="form_field" name="css_php" value="INLINE"$content[css_php_inline] /> {--ADMIN_CSS_PHP_INLINE--}
+                       <input type="radio" class="form_field" name="css_php" value="DIRECT"$content[css_php_direct] /> {--ADMIN_SELECT_CSS_OUTPUT_MODE_DIRECT--}<br />
+                       <input type="radio" class="form_field" name="css_php" value="FILE"$content[css_php_file] /> {--ADMIN_SELECT_CSS_OUTPUT_MODE_FILE--}<br />
+                       <input type="radio" class="form_field" name="css_php" value="INLINE"$content[css_php_inline] /> {--ADMIN_SELECT_CSS_OUTPUT_MODE_INLINE--}
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_GUEST_MENU--}:</td>
                <td>
-                       <input type="radio" class="form_field" name="guest_menu" value="Y"$content[guest_menu_y] /> {--ADMIN_GUEST_MENU_ACTIVE--}<br />
-                       <input type="radio" class="form_field" name="guest_menu" value="N"$content[guest_menu_n] /> {--ADMIN_GUEST_MENU_INACTIVE--}
+                       <input type="radio" class="form_field" name="guest_menu" value="Y"$content[guest_menu_y] /> {--ADMIN_IS_SHOWN--}<br />
+                       <input type="radio" class="form_field" name="guest_menu" value="N"$content[guest_menu_n] /> {--ADMIN_IS_NOT_SHOWN--}
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_MEMBER_MENU--}:</td>
                <td>
-                       <input type="radio" class="form_field" name="member_menu" value="Y"$content[member_menu_y] /> {--ADMIN_MEMBER_MENU_ACTIVE--}<br />
-                       <input type="radio" class="form_field" name="member_menu" value="N"$content[member_menu_n] /> {--ADMIN_MEMBER_MENU_INACTIVE--}
+                       <input type="radio" class="form_field" name="member_menu" value="Y"$content[member_menu_y] /> {--ADMIN_IS_SHOWN--}<br />
+                       <input type="radio" class="form_field" name="member_menu" value="N"$content[member_menu_n] /> {--ADMIN_IS_NOT_SHOWN--}
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_YOURE_HERE--}:</td>
                <td>
-                       <input type="radio" class="form_field" name="youre_here" value="Y"$content[youre_here_y] /> {--ADMIN_YOURE_HERE_ACTIVE--}<br />
-                       <input type="radio" class="form_field" name="youre_here" value="N"$content[youre_here_n] /> {--ADMIN_YOURE_HERE_INACTIVE--}
+                       <input type="radio" class="form_field" name="youre_here" value="Y"$content[youre_here_y] /> {--ADMIN_IS_SHOWN--}<br />
+                       <input type="radio" class="form_field" name="youre_here" value="N"$content[youre_here_n] /> {--ADMIN_IS_NOT_SHOWN--}
                </td>
        </tr>