Editing of bank packages added (updating records not finished!)

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

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index 58402cb588582351c0ad11ef0ec9ae3ace9302d0..a294dd5b4b5c740e5ee0fae44fdcf0352c1ee4df 100644 (file)
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -105,7 +105,7 @@ PRIMARY KEY(id)
        // --- MENU SYSTEMS ---
        //
        // Admin menu
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', '', '{!POINTS!}-Verdoppler', 'Einstellungen und Einträge auflisten.', 4)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler', 'Einstellungen und Einträge auflisten.', 4)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', 'list_doubler', 'Auflisten', 'Einträge aus der Verdiensttabelle auflisten', 1)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('doubler', 'config_doubler', 'Einstellungen', 'Prozentuale Gebühr usw. einstellen.', 2)";
 
@@ -173,9 +173,6 @@ case "update": // Update an extension
                break;
 
        case "0.0.6": // SQL queries for v0.0.6
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_config SET doubler_used=doubler_used+(SUM(d.points)*c.doubler_charge)
-FROM "._MYSQL_PREFIX."_doubler AS d, "._MYSQL_PREFIX."_config AS c
-WHERE d.completed='N'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_max_sent tinyint(4) not null default '1'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_group_sent tinyint(4) not null default '1'";
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD doubler_sent_all enum('Y', 'N') not null default 'Y'";
@@ -239,27 +236,9 @@ WHERE d.completed='N'";
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
-       $_CONFIG['doubler_charge']      = $DUMMY['doubler_charge'];
-       $_CONFIG['doubler_jackpot']     = $DUMMY['doubler_jackpot'];
-       $_CONFIG['doubler_own']         = $DUMMY['doubler_own'];
-       $_CONFIG['doubler_uid']         = $DUMMY['doubler_uid'];
-       $_CONFIG['doubler_points']      = $DUMMY['doubler_points'];
-       $_CONFIG['doubler_used']        = $DUMMY['doubler_used'];
-       $_CONFIG['doubler_send_mode']   = $DUMMY['doubler_send_mode'];
-       $_CONFIG['doubler_timeout']     = $DUMMY['doubler_timeout'];
-       $_CONFIG['doubler_display_new'] = $DUMMY['doubler_display_new'];
-       $_CONFIG['doubler_display_pay'] = $DUMMY['doubler_display_pay'];
-       $_CONFIG['doubler_display_old'] = $DUMMY['doubler_display_old'];
-       $_CONFIG['doubler_ref']         = $DUMMY['doubler_ref'];
-       $_CONFIG['doubler_min']         = $DUMMY['doubler_min'];
-       $_CONFIG['doubler_max']         = $DUMMY['doubler_max'];
-       $_CONFIG['doubler_left']        = $DUMMY['doubler_left'];
-       $_CONFIG['doubler_counter']     = $DUMMY['doubler_counter'];
-       $_CONFIG['doubler_max_sent']    = $DUMMY['doubler_max_sent'];
-       $_CONFIG['doubler_group_sent']  = $DUMMY['doubler_group_sent'];
-       $_CONFIG['doubler_sent_all']    = $DUMMY['doubler_sent_all'];
-       unset($DUMMY);
+       $dummy = LOAD_CONFIG();
+       $_CONFIG = array_merge($_CONFIG, $dummy);
+       unset($dummy);
 
        if ((defined('__DAILY_RESET')) && ($_CONFIG['doubler_send_mode'] == "RESET"))
        {