X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-doubler.php;h=a294dd5b4b5c740e5ee0fae44fdcf0352c1ee4df;hb=148d3a3e1641e350a708cc71e194349a09a8285f;hp=cd905390cfcfc6fc449d4ee658be22d0a033e370;hpb=1b4494c45790f1ba6808bb6a037d777147bd8f23;p=mailer.git

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index cd905390cf..a294dd5b4b 100644
--- 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'";
@@ -186,7 +183,7 @@ WHERE d.completed='N'";
 
 	case "0.0.7": // SQL queries for v0.0.7
 		// Update notes (these will be set as task text!)
-		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.<BR><BR>Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.";
+		$UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.<br /><br />Minus-Guthaben des Verdoppler-Accounts repariert und Mitgliedsmail erweitert mit Transaktionsummer und IP-Nummer.";
 		break;
 
 	case "0.0.8": // SQL queries for v0.0.8
@@ -239,29 +236,11 @@ 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);
-
-	if ((defined('__DAILY_RESET')) && ($CONFIG['doubler_send_mode'] == "RESET"))
+	$dummy = LOAD_CONFIG();
+	$_CONFIG = array_merge($_CONFIG, $dummy);
+	unset($dummy);
+
+	if ((defined('__DAILY_RESET')) && ($_CONFIG['doubler_send_mode'] == "RESET"))
 	{
 		// So let's check for points
 		$INC_POOL[] = PATH."inc/doubler_send.php";