From 499c5676104cbdcbf480cdab20a28a14247ac442 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 9 Nov 2010 23:04:18 +0000 Subject: [PATCH] More wrapper functions introduced, duplicate language strings merged: - Some duplicate language strings merged - More wrapper functions for configuration entries introduced - TODOs.txt updated --- DOCS/TODOs.txt | 4 ++-- inc/filters.php | 2 +- inc/language/other_de.php | 14 +++++--------- inc/mails/beg_mails.php | 2 +- inc/mails/bonus_mails.php | 2 +- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/monthly/monthly_ | 6 ++++++ inc/monthly/monthly_beg.php | 9 ++++++--- inc/monthly/monthly_bonus.php | 9 ++++++--- inc/monthly/monthly_newsletter.php | 6 ++++++ inc/monthly/monthly_surfbar.php | 6 ++++++ inc/reset/reset_ | 6 ++++++ inc/reset/reset_100_bonus.php | 6 ++++++ inc/reset/reset_autopurge.php | 6 ++++++ inc/reset/reset_beg.php | 6 ++++++ inc/reset/reset_birthday.php | 8 +++++++- inc/reset/reset_bonus.php | 6 ++++++ inc/reset/reset_daily.php | 6 ++++++ inc/reset/reset_doubler.php | 6 ++++++ inc/reset/reset_engine.php | 6 ++++++ inc/reset/reset_holiday.php | 6 ++++++ inc/reset/reset_profile.php | 6 ++++++ inc/reset/reset_surfbar.php | 6 ++++++ inc/reset/reset_yoomedia.php | 6 ++++++ inc/weekly/weekly_ | 6 ++++++ inc/weekly/weekly_surfbar.php | 6 ++++++ inc/wrapper-functions.php | 12 ++++++++++++ templates/de/html/admin/admin_config_other.tpl | 18 +++++++++--------- 29 files changed, 154 insertions(+), 32 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 0404331a79..f513476b8a 100644 --- 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 5c538afb2a..0b07e67b7e 100644 --- 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 8bb3e33eac..c24bcd8949 100644 --- 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 (empfohlen)", - 'ADMIN_CSS_PHP_INLINE' => "In <style>-Tag eingeschlossen ausgeben (Debug!)", + 'ADMIN_SELECT_CSS_OUTPUT_MODE_DIRECT' => "Per <link>-Tag ausgeben (Debug!)", + 'ADMIN_SELECT_CSS_OUTPUT_MODE_FILE' => "Per css.php ausgeben", + 'ADMIN_SELECT_CSS_OUTPUT_MODE_INLINE' => "In <style>-Tag ausgeben", 'ADMIN_OPTION_GUEST_MENU' => "Gastmenü ein-/ausblenden", 'ADMIN_OPTION_MEMBER_MENU' => "Mitgliedsmenü ein-/ausblenden", 'ADMIN_OPTION_YOURE_HERE' => "Navigation "Sie sind hier" 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 f6e2a9b526..5a26daa379 100644 --- 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 371e0b621b..d1a9ff84f0 100644 --- 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 2f2aece444..b11bba4848 100644 --- 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 37d9fe196f..cdc608bcf4 100644 --- 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 feed29db62..20811698f9 100644 --- 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 6a557df326..34fa872965 100644 --- 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 1b746af267..acbe511eec 100644 --- 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 1911913acf..fc0796e9a6 100644 --- 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 c69dc5a428..254c6d4fab 100644 --- 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 ae17de0b10..cc983a3029 100644 --- 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 55933843d7..265388459a 100644 --- 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 948f36fc45..518d3601e4 100644 --- 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 3780c0996e..05c56e0708 100644 --- 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 dc3f70660a..b194ef628f 100644 --- 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 38d97091fb..cb36ff75d5 100644 --- 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 d033e12db7..02b19d73f9 100644 --- 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 4d9d8db77b..8fc2f1028d 100644 --- 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 69a979cb6c..e4a970f03f 100644 --- 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 33689d69de..a4a9f316bc 100644 --- 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 1dfe8c6aed..5507e0aa42 100644 --- 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 459d6f193d..758fcabe2d 100644 --- 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 39417c9a71..8a22f74bba 100644 --- 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 584015acd4..ee762ac01f 100644 --- 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 70e64eb7f3..eeaeea8bd8 100644 --- 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 afd6a25b19..4c3e4a8c0e 100644 --- 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 c86e8dc213..bf170f398d 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -86,33 +86,33 @@ {--ADMIN_OPTION_CSS_PHP--}: - {--ADMIN_CSS_PHP_DIRECT--}
- {--ADMIN_CSS_PHP_FILE--}
- {--ADMIN_CSS_PHP_INLINE--} + {--ADMIN_SELECT_CSS_OUTPUT_MODE_DIRECT--}
+ {--ADMIN_SELECT_CSS_OUTPUT_MODE_FILE--}
+ {--ADMIN_SELECT_CSS_OUTPUT_MODE_INLINE--} {--ADMIN_OPTION_GUEST_MENU--}: - {--ADMIN_GUEST_MENU_ACTIVE--}
- {--ADMIN_GUEST_MENU_INACTIVE--} + {--ADMIN_IS_SHOWN--}
+ {--ADMIN_IS_NOT_SHOWN--} {--ADMIN_OPTION_MEMBER_MENU--}: - {--ADMIN_MEMBER_MENU_ACTIVE--}
- {--ADMIN_MEMBER_MENU_INACTIVE--} + {--ADMIN_IS_SHOWN--}
+ {--ADMIN_IS_NOT_SHOWN--} {--ADMIN_OPTION_YOURE_HERE--}: - {--ADMIN_YOURE_HERE_ACTIVE--}
- {--ADMIN_YOURE_HERE_INACTIVE--} + {--ADMIN_IS_SHOWN--}
+ {--ADMIN_IS_NOT_SHOWN--} -- 2.39.5