Surfbar URL status translation added, member template name fixed

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

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index a03d7672f49253a8ad43957a21be44f2ef89e6a6..395f1a546fa55ad04d1b95e310bacec114aa8f73 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -52,7 +52,7 @@ switch ($EXT_LOAD_MODE)
 case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu VALUES (NULL,'email','send_bonus','Bonusmail senden',5,'Versenden Sie hier Bonus-Mails an alle Mitglieder oder nur an alle aus einer Kategorie. Es spielt keine Rolle, wie viele Mails bereits versendet worden, Sie können hier immer senden.')";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Bonuspunkte',7,'Y','Y','',0)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Bonuspunkte',7,'Y','Y', '', 0)";
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_bonus";
        $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_bonus (
 id bigint(20) NOT NULL auto_increment,
@@ -162,7 +162,7 @@ KEY userid (userid)
 
        case "0.2.3": // SQL queries for v0.2.3
                $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE action='main' AND what='bonus' LIMIT 1";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Aktiv-Rallye',7,'Y','Y','',0)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Aktiv-Rallye',7,'Y','Y', '', 0)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiv-Rallye mit Klick-Vergütung hinzugefügt.";
@@ -541,37 +541,13 @@ WHERE last_online < ".$mark." ORDER BY userid";
 
 default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
-       $_CONFIG['login_bonus']          = $dummy['login_bonus'];          // Bonus points for successfull logins
-       $_CONFIG['turbo_bonus']          = $dummy['turbo_bonus'];          // Bonus points for the fastest clicker, No. 1
-       $_CONFIG['bonus_rates']          = $dummy['turbo_rates'];          // Points for clicker no. 2 to x
-       $_CONFIG['bonus_ranks']          = $dummy['bonus_ranks'];          // Total ranks who can win
-       $_CONFIG['login_timeout']        = $dummy['login_timeout'];        // Time in seconds between two logins
-       $_CONFIG['bonus_month']          = $dummy['last_bonus_month'];     // Last month where click-bonus are "paid"
-       $_CONFIG['bonus_mode']           = $dummy['bonus_mode'];           // Mode for adding points for login/click bonus
-       $_CONFIG['bonus_uid']            = $dummy['bonus_uid'];            // Member account to take points from
-       $_CONFIG['bonus_lines']          = $dummy['bonus_lines'];          // Number of lines to display in show_bonus.php
-       $_CONFIG['bonus_timeout']        = $dummy['bonus_timeout'];        // Auto-Purge timeout for bonus lines in mxchange_bonus_turbo
-       $_CONFIG['bonus_order']          = $dummy['bonus_order'];          // Bonus points for ordering mails
-       $_CONFIG['bonus_ref']            = $dummy['bonus_ref'];            // Bonus points for "making" a referral
-       $_CONFIG['bonus_stats']          = $dummy['bonus_stats'];          // Bonus points for 100% clickrate in mail stats
-       $_CONFIG['bonus_active']         = $dummy['bonus_active'];         // De/activate bonus active rallye
-       $_CONFIG['bonus_order_yn']       = $dummy['bonus_order_yn'];       // Include order bonus in analysis?
-       $_CONFIG['bonus_ref_yn']         = $dummy['bonus_ref_yn'];         // Include referral bonus in analysis?
-       $_CONFIG['bonus_stats_yn']       = $dummy['bonus_stats_yn'];       // Include statistics bonus in analysis?
-       $_CONFIG['bonus_login_yn']       = $dummy['bonus_login_yn'];       // Include login bonus in analysis?
-       $_CONFIG['bonus_click_yn']       = $dummy['bonus_click_yn'];       // Include "mailid" bonus in analysis?
-       $_CONFIG['bonus_en_notify']      = $dummy['bonus_en_notify'];      // Notify members about enabled active rallye?
-       $_CONFIG['bonus_di_notify']      = $dummy['bonus_di_notify'];      // Notify members about disabled active rallye?
-       $_CONFIG['bonus_new_mem_notify'] = $dummy['bonus_new_mem_notify']; // Notify members about disabled active rallye?
-       $_CONFIG['bonus_notify_points']  = $dummy['bonus_notify_points'];  // Bonus points for the enable-notification mail? 0 = disable!
-       $_CONFIG['bonus_notify_wait']    = $dummy['bonus_notify_wait'];    // Time to wait in seconds for bonus mails
-       $_CONFIG['bonus_include_own']    = $dummy['bonus_include_own'];    // Include webmaster's own userid in active rallye?
+       $_CONFIG = array_merge($_CONFIG, $dummy);
        unset($dummy);
 
        if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
        {
                // Daily reset was run so let's check if active rallye is activated
-               if ($_CONFIG['bonus_active'] == 'Y')
+               if ($_CONFIG['bonus_active'] == "Y")
                {
                        // Run active rallye
                        if($_CONFIG['bonus_stats'] > 0) $INC_POOL[] = PATH."inc/stats_bonus.php";
@@ -585,7 +561,7 @@ default: // Do stuff when extension is loaded
        }
 
        // Check for bonus rallye is active and send mails out
-       if (($_CONFIG['bonus_active'] == 'Y') && ($_CONFIG['bonus_new_mem_notify'] == 'Y'))
+       if (($_CONFIG['bonus_active'] == "Y") && ($_CONFIG['bonus_new_mem_notify'] == "Y"))
        {
                // Include file for sending out mails
                $INC_POOL[] = PATH."inc/mails/bonus_mails.php";
@@ -597,7 +573,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "bonus";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'N';
+$EXT_ALWAYS_ACTIVE = "N";
 
 //
 ?>