From b91d882dbd9bb78ee175a108b5ee0dfcd29d5bbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 14 Sep 2008 21:34:38 +0000 Subject: [PATCH] - Concept of a safe for collected points added - Loading of configuration (see function LOAD_CONFIG()) rewritten --- .gitattributes | 2 + inc/databases.php | 2 +- inc/extensions/ext- | 2 - inc/extensions/ext-active.php | 4 +- inc/extensions/ext-autopurge.php | 5 +- inc/extensions/ext-beg.php | 4 - inc/extensions/ext-birthday.php | 8 -- inc/extensions/ext-bonus.php | 4 - inc/extensions/ext-cache.php | 8 +- inc/extensions/ext-doubler.php | 4 - inc/extensions/ext-holiday.php | 3 - inc/extensions/ext-maintenance.php | 4 +- inc/extensions/ext-mediadata.php | 3 - inc/extensions/ext-newsletter.php | 4 - inc/extensions/ext-nickname.php | 2 + inc/extensions/ext-order.php | 5 +- inc/extensions/ext-other.php | 7 +- inc/extensions/ext-primera.php | 4 +- inc/extensions/ext-register.php | 3 - inc/extensions/ext-rewrite.php | 4 +- inc/extensions/ext-safe.php | 94 +++++++++++++++++ inc/extensions/ext-sponsor.php | 3 - inc/extensions/ext-sql_patches.php | 17 +-- inc/extensions/ext-surfbar.php | 3 - inc/extensions/ext-top10.php | 3 - inc/extensions/ext-transfer.php | 8 +- inc/extensions/ext-user.php | 4 +- inc/extensions/ext-wernis.php | 4 +- inc/extensions/ext-yoomedia.php | 2 - inc/mysql-connect.php | 159 ++++++++++++----------------- templates/de/html/ext/ext_safe.tpl | 13 +++ 31 files changed, 196 insertions(+), 196 deletions(-) create mode 100644 inc/extensions/ext-safe.php create mode 100644 templates/de/html/ext/ext_safe.tpl diff --git a/.gitattributes b/.gitattributes index 05e01963af..e73e21b501 100644 --- a/.gitattributes +++ b/.gitattributes @@ -129,6 +129,7 @@ inc/extensions/ext-rallye.php -text inc/extensions/ext-register.php -text inc/extensions/ext-repair.php -text inc/extensions/ext-rewrite.php -text +inc/extensions/ext-safe.php -text inc/extensions/ext-sponsor.php -text inc/extensions/ext-sql_patches.php -text inc/extensions/ext-support.php -text @@ -1133,6 +1134,7 @@ templates/de/html/ext/ext_rallye.tpl -text templates/de/html/ext/ext_register.tpl -text templates/de/html/ext/ext_repair.tpl -text templates/de/html/ext/ext_rewrite.tpl -text +templates/de/html/ext/ext_safe.tpl -text templates/de/html/ext/ext_sponsor.tpl -text templates/de/html/ext/ext_sql_patches.tpl -text templates/de/html/ext/ext_support.tpl -text diff --git a/inc/databases.php b/inc/databases.php index 5eeb978411..66cd2d05e8 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "327"); +define('CURR_SVN_REVISION', "328"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/extensions/ext- b/inc/extensions/ext- index 3b7509a073..ebada93095 100644 --- a/inc/extensions/ext- +++ b/inc/extensions/ext- @@ -81,8 +81,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - unset($dummy); break; } diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 47849445de..7ede8afbbd 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -122,11 +122,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "active"; diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index d029ba56fb..6a8ee9dcd3 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -252,10 +252,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); - // Do we have a daily-reset-run? if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1)) { @@ -264,6 +260,7 @@ default: // Do stuff when extension is loaded } break; } + // Language file prefix $EXT_LANG_PREFIX = "autopurge"; diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 310d5cf425..d9d4a9a23c 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -253,10 +253,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); - // Remove old entries $OLD = $_CONFIG['beg_timeout']; if ($_CONFIG['beg_uid_timeout'] > $OLD) $OLD = $_CONFIG['beg_uid_timeout']; diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 48008a6e61..8cbf2b954d 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -192,14 +192,6 @@ CHANGE `birth_year` `birth_year` SMALLINT(4) UNSIGNED ZEROFILL NOT NULL DEFAULT break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - - // Copy config to main array - $_CONFIG = merge_array($_CONFIG, $dummy); - - // Save some RAM... - unset($dummy); - if ((isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['birthday_points'] > 0)) { // Daily reset was run and we shall pay points so we start checking for members who // has a birthday for today diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index c3db49da19..7adaf2f7d5 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -531,10 +531,6 @@ WHERE last_online < ".$mark." ORDER BY userid"; break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); - if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1)) { // Daily reset was run so let's check if active rallye is activated diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index 6ce6c3fa27..4df414fa19 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -184,13 +184,8 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); - // Create instance on class - if ($cacheMode != "init") - { + if ($cacheMode != "init") { // Initialize cache system only when it's needed $cacheInstance = new mxchange_cache($_CONFIG['cache_update'], PATH."inc/".$_CONFIG['cache_path'], $_CONFIG['cache_tested']); if ($cacheInstance->ret != "done") @@ -201,6 +196,7 @@ default: // Do stuff when extension is loaded } break; } + // Language file prefix $EXT_LANG_PREFIX = "cache"; diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index afb8f39fcf..2a4f2614cb 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -236,10 +236,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); - if ((isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['doubler_send_mode'] == "RESET")) { // So let's check for points $INC_POOL[] = sprintf("%sinc/doubler_send.php", PATH); diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 9387596d95..30c04ad8ee 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -224,9 +224,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php index c03dc6eb73..6609192764 100644 --- a/inc/extensions/ext-maintenance.php +++ b/inc/extensions/ext-maintenance.php @@ -106,11 +106,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "maintenance"; diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index 7c0aebd8bb..d28a087742 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -129,9 +129,6 @@ Bitte stellen Sie diesen derzeit manuell unter = "0.1.1")) { @@ -315,6 +311,7 @@ default: // Do stuff when extension is loaded } break; } + // Language file prefix $EXT_LANG_PREFIX = "order"; diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php index 2b658190c8..1c7fc2bff0 100644 --- a/inc/extensions/ext-other.php +++ b/inc/extensions/ext-other.php @@ -192,14 +192,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG['max_comma'] = $dummy['max_comma']; // Maximum numbers behind commata - $_CONFIG['reject_url'] = $dummy['reject_url']; // Default rejection URL - $_CONFIG['mailid_error_redirect'] = $dummy['mailid_error_redirect']; // Default rejection URL - define('__CURRENCY', $dummy['currency']); // This is the currency for fees! They shall normally remain in real money currencies... - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "other"; diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index 4995184559..631f96e5a6 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -111,11 +111,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "primera"; diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 7bcce2a914..1d510b728d 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -323,9 +323,6 @@ PRIMARY KEY(id) break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php index 5328c1d739..28c623aa44 100644 --- a/inc/extensions/ext-rewrite.php +++ b/inc/extensions/ext-rewrite.php @@ -136,11 +136,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "rewrite"; diff --git a/inc/extensions/ext-safe.php b/inc/extensions/ext-safe.php new file mode 100644 index 0000000000..8fb3f79e94 --- /dev/null +++ b/inc/extensions/ext-safe.php @@ -0,0 +1,94 @@ + diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 75d85830b0..35abe65905 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -427,9 +427,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index c387d98aa6..2ed851d3fa 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -577,13 +577,9 @@ PRIMARY KEY (id) break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - // When the sql_patches is not installed we cannot load it's configuration... *sigh* if (GET_EXT_VERSION("sql_patches") != '') { $_CONFIG['secret_key'] = ""; - //die("
".print_r($dummy, true)."
"); - $_CONFIG = merge_array($_CONFIG, $dummy); // Read key from secret file if ((empty($_CONFIG['file_hash'])) || (empty($_CONFIG['master_salt'])) || (empty($_CONFIG['pass_scramble']))) { @@ -613,11 +609,11 @@ default: // Do stuff when extension is loaded } // END - if // Transfer words/numbers to constants - define('POINTS' , $dummy['points_word']); - define('MT_WORD' , $dummy['mt_word']); - define('MT_WORD2', $dummy['mt_word2']); - define('MT_WORD3', $dummy['mt_word3']); - define('_MAX' , $dummy['rand_no']); + define('POINTS' , $_CONFIG['points_word']); + define('MT_WORD' , $_CONFIG['mt_word']); + define('MT_WORD2', $_CONFIG['mt_word2']); + define('MT_WORD3', $_CONFIG['mt_word3']); + define('_MAX' , $_CONFIG['rand_no']); } else { // Set some lame ;-) default settings $_CONFIG['def_refid'] = 0; @@ -629,9 +625,6 @@ default: // Do stuff when extension is loaded define('MT_WORD2', DEFAULT_MT_WORD2); define('POINTS' , DEFAULT_POINTS); } - - // Remove dummy config array - unset($dummy); break; } diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 6151ba4a98..0376697a70 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -171,9 +171,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index c764d09346..0ec4802f29 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -142,9 +142,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 3d7905dfdf..907583ad06 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -283,17 +283,13 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); - - if ((isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['ap_transfer'] == "Y")) - { + if ((isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['ap_transfer'] == "Y")) { // Automatically remove outdated or not displayed transactions TRANSFER_AUTPPURGE($_CONFIG['transfer_max'], $_CONFIG['transfer_age']); } break; } + // Language file prefix $EXT_LANG_PREFIX = "transfer"; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index c10a34665a..3aa099c5fe 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -214,11 +214,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "user"; diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index 24634ea2c2..e1f5bdd5c1 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -126,11 +126,9 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - $_CONFIG = merge_array($_CONFIG, $dummy); - unset($dummy); break; } + // Language file prefix $EXT_LANG_PREFIX = "wernis"; diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index 93461af485..6dc9287dd3 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -80,8 +80,6 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded - $dummy = LOAD_CONFIG(); - unset($dummy); break; } diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 1f2fefc671..57737072c9 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -95,103 +95,76 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database // Load configuration stuff - $result = SQL_QUERY("SELECT pass_len, points_register, points_ref, least_cats, check_double_email, check_double_pass, admin_notify, url_tlock, test_text, max_tlength, test_subj, autosend_active, max_send, url_blacklist, auto_purge, auto_purge_active, last_update, unconfirmed, profile_lock, online_timeout, mad_timestamp, mad_count, profile_update, send_prof_update, resend_profile_update, code_length, patch_level, patch_ctime, guest_stats, ref_payout, activate_xchange, order_multi_page, display_refid, ip_timeout, allow_direct_pay, config -FROM "._MYSQL_PREFIX."_config -WHERE config=0 -LIMIT 1", __FILE__, __LINE__); - - if (SQL_NUMROWS($result) == 1) { - // Load data when previous SQL query did not fail - if (!is_resource($result)) { - // Something went wrong - ADD_FATAL(FATAL_CANNOT_LOAD_CONFIG); - return; - } // END - if - - // Load the configuration - $_CONFIG = array_merge($_CONFIG, SQL_FETCHARRAY($result)); - - // Initialize include-file-pool - $INC_POOL = array(); - - // Load "databases" aka static arrays - require_once(PATH."inc/databases.php"); - - // Loading patching system is required here... - require_once(PATH."inc/patch-system.php"); // Initialize patch system - - // Functions which are related to themes - require_once(PATH."inc/theme-manager.php"); - - // Run daily reset - require_once(PATH."inc/check-reset.php"); - - // Load admin include file if he is admin - if (IS_ADMIN()) { - // Administrative functions - require_once(PATH."inc/modules/admin/admin-inc.php"); - } // END - if - - // Get all values - if (($CSS != 1) && ($CSS != -1)) { - if (empty($GLOBALS['module'])) $GLOBALS['module'] = "empty"; - if (empty($GLOBALS['what'])) $GLOBALS['what'] = GET_WHAT($GLOBALS['module']); - if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); - } else { - // Set action/what to empty - $GLOBALS['action'] = ""; - $GLOBALS['what'] = ""; - } + $_CONFIG = LOAD_CONFIG(); + + // Initialize include-file-pool + $INC_POOL = array(); + + // Load "databases" aka static arrays + require_once(PATH."inc/databases.php"); + + // Loading patching system is required here... + require_once(PATH."inc/patch-system.php"); // Initialize patch system + + // Functions which are related to themes + require_once(PATH."inc/theme-manager.php"); + + // Run daily reset + require_once(PATH."inc/check-reset.php"); - // Secure and validate user ID from cookie - UPDATE_LOGIN_DATA(); - - // Update online list - UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); - - // Load theme name - $currTheme = GET_CURR_THEME(); - - // Set default 'what' value - //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; - if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) { - if ($GLOBALS['module'] == "admin") { - // Set 'action' value to 'login' in admin menu - $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); - } elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) { - // Set 'what' value to 'welcome' in guest and member menu - $GLOBALS['what'] = "welcome"; - if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home']; - } else { - // Anything else like begging link - $GLOBALS['what'] = ""; - } - } // END - if - - // Update sending pool - if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."inc/pool-update.php"); // Sends out mails in configureable steps - - // Load all active extension including language files when not upgrading. - // Check module for testing and count one click - $dummy = CHECK_MODULE($GLOBALS['module']); - if ($dummy == "done") COUNT_MODULE($GLOBALS['module']); - unset($dummy); - - // Shall we activate the exchange? - if ($_CONFIG['activate_xchange'] > 0) activateExchange(); + // Load admin include file if he is admin + if (IS_ADMIN()) { + // Administrative functions + require_once(PATH."inc/modules/admin/admin-inc.php"); + } // END - if + + // Get all values + if (($CSS != 1) && ($CSS != -1)) { + if (empty($GLOBALS['module'])) $GLOBALS['module'] = "empty"; + if (empty($GLOBALS['what'])) $GLOBALS['what'] = GET_WHAT($GLOBALS['module']); + if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); } else { - // If you will read following error message you probably need to contact me (webmaster@mxchange.org) - // and download the sql-upgrades extension from my server. Please ask me which SQL file(s) you need to - // import *BEFORE* you import them! - ADD_FATAL(FATAL_CANNOT_LOAD_CONFIG); - - // Reset link and db here, close database first - SQL_CLOSE($link, __FILE__, __LINE__); - $link = false; $db = false; + // Set action/what to empty + $GLOBALS['action'] = ""; + $GLOBALS['what'] = ""; } - // Free memory - SQL_FREERESULT($result); + // Secure and validate user ID from cookie + UPDATE_LOGIN_DATA(); + + // Update online list + UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); + + // Load theme name + $currTheme = GET_CURR_THEME(); + + // Set default 'what' value + //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; + if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) { + if ($GLOBALS['module'] == "admin") { + // Set 'action' value to 'login' in admin menu + $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); + } elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) { + // Set 'what' value to 'welcome' in guest and member menu + $GLOBALS['what'] = "welcome"; + if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home']; + } else { + // Anything else like begging link + $GLOBALS['what'] = ""; + } + } // END - if + + // Update sending pool + if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."inc/pool-update.php"); // Sends out mails in configureable steps + + // Load all active extension including language files when not upgrading. + // Check module for testing and count one click + $dummy = CHECK_MODULE($GLOBALS['module']); + if ($dummy == "done") COUNT_MODULE($GLOBALS['module']); + unset($dummy); + + // Shall we activate the exchange? + if ($_CONFIG['activate_xchange'] > 0) activateExchange(); // Generate random number if (isset($GLOBALS['userid'])) { diff --git a/templates/de/html/ext/ext_safe.tpl b/templates/de/html/ext/ext_safe.tpl new file mode 100644 index 0000000000..b999cdbc02 --- /dev/null +++ b/templates/de/html/ext/ext_safe.tpl @@ -0,0 +1,13 @@ +Der Tresor kann von Ihren Mitgliedern zum Sichern von angesammelten {!POINTS!} +benutzt werden. Zusätzlich erhalten Ihre Mitglieder, wenn Sie die +Erweiterung active in Ihrem {!MT_WORD!} installiert und die +Aktiv-Rallye aktiviert haben, jeden Monat Zinsen auf das gesicherte Guthaben. +Die Zinsabstuffung können Sie im Adminbereich frei einstellen und dabei +beliebig viele Zinsstufen einrichten. Eine Zinsstufe richtet sich nach einem +einstellbaren Bereich an Aktiv-{!POINTS!}, die das Mitglied für diverse +Aktionen gesammelt hat.
+
+Zusätzlich ist der Tresor durch ein Tresor-Passwort geschützt. Hat das +Mitglied dies nicht mehr, so es einen Link per Mail zugesandt bekommen, womit es +dann ein neues Tresor-Passwort einstellen kann. Das Tresor-Passwort muss +unterschiedlich zum Account-Passwort sein! -- 2.39.5