Password reset for admin login added (still buggy if cache is installed and sql_patch...

[mailer.git] / inc / extensions / ext-beg.php

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 02e74e1a386b71dbfb6559cd92f7b9eac36ae95c..87a928f8ff1fd9087be5cfd4406e7b33a326d90d 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -143,7 +143,7 @@ case "update": // Update an extension
                $UPDATE_NOTES = "Bitte verschieben Sie die beg-Templates (Ordner: ".PATH."/templates/".GET_LANGUAGE()."/html/) in den neuen Order beg!";
                break;
 
-       case "0.1.0": // SQL queries for v0.1.0
+       case "0.1.0": // SQL queries for v0.2.1
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Abspeichern von Einstellungen repariert.";
                break;
@@ -259,35 +259,19 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
-       $CONFIG['beg_timeout']        = $DUMMY['beg_timeout'];        // Global timeout
-       $CONFIG['beg_uid_timeout']    = $DUMMY['beg_uid_timeout'];    // Timeout for one userid
-       $CONFIG['beg_ip_timeout']     = $DUMMY['beg_ip_timeout'];     // Timeout for one IP number
-       $CONFIG['beg_points']         = $DUMMY['beg_points'];         // Minimum beggable points
-       $CONFIG['beg_points_max']     = $DUMMY['beg_points_max'];     // Maximum beggable points
-       $CONFIG['beg_uid']            = $DUMMY['beg_uid'];            // Account to subtract begged points from
-       $CONFIG['beg_mode']           = $DUMMY['beg_mode'];           // Payment mode: direct or over referral system?
-       $CONFIG['beg_month']          = $DUMMY['beg_month'];          // Current month
-       $CONFIG['beg_ranks']          = $DUMMY['beg_ranks'];          // Maximum member who will win
-       $CONFIG['beg_active']         = $DUMMY['beg_active'];         // Only active members can win?
-       $CONFIG['beg_rallye']         = $DUMMY['beg_rallye'];         // Is the begging rallye activated?
-       $CONFIG['beg_ral_en_notify']  = $DUMMY['beg_ral_en_notify'];  // Notify members on enabled rallye?
-       $CONFIG['beg_ral_di_notify']  = $DUMMY['beg_ral_di_notify'];  // Notify members on disabled rallye?
-       $CONFIG['beg_notify_bonus']   = $DUMMY['beg_notify_bonus'];   // When points are > 0 and bonus extension is installed, a bonus mail with this amount of points will be send instead of an enable-notification!
-       $CONFIG['beg_new_mem_notify'] = $DUMMY['beg_new_mem_notify']; // Notify members on disabled rallye?
-       $CONFIG['beg_notify_wait']    = $DUMMY['beg_notify_wait'];    // Time to wait in seconds for bonus mails
-       $CONFIG['beg_include_own']    = $DUMMY['beg_include_own'];    // Include webmaster's own userid in rallye?
-       unset($DUMMY);
+       $dummy = LOAD_CONFIG();
+       $_CONFIG = array_merge($_CONFIG, $dummy);
+       unset($dummy);
 
        // Remove old entries
-       $OLD = $CONFIG['beg_timeout'];
-       if ($CONFIG['beg_uid_timeout'] > $OLD) $OLD = $CONFIG['beg_uid_timeout'];
+       $OLD = $_CONFIG['beg_timeout'];
+       if ($_CONFIG['beg_uid_timeout'] > $OLD) $OLD = $_CONFIG['beg_uid_timeout'];
        $result_ext = SQL_QUERY("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_beg_ips WHERE timeout < ".(time() - $OLD - 60*60), __FILE__, __LINE__);
 
        if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
        {
                // Daily reset was run so let's check if begging rallye is active
-               if ($CONFIG['beg_rallye'] == "Y")
+               if ($_CONFIG['beg_rallye'] == "Y")
                {
                        // Check for our winers
                        $INC_POOL[] = PATH."inc/monthly/monthly_beg.php";
@@ -300,7 +284,7 @@ default: // Do stuff when extension is loaded
        }
 
        // Check for beg rallye is active and send mails out
-       if (($CONFIG['beg_rallye'] == "Y") && ($CONFIG['beg_new_mem_notify'] == "Y"))
+       if (($_CONFIG['beg_rallye'] == "Y") && ($_CONFIG['beg_new_mem_notify'] == "Y"))
        {
                // Include file for sending out mails
                $INC_POOL[] = PATH."inc/mails/beg_mails.php";