X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fdoubler_send.php;h=f5a671d9ae25f1207df68468482ecb6a918f7594;hb=a0c37ca650d27d0aed672ebf34e1be4601a2e0e9;hp=b6a7505e1d14aea7fee79adf323d558941bc1f54;hpb=497d9d8fcda61391c149af3747118bb2772c7c26;p=mailer.git

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index b6a7505e1d..f5a671d9ae 100644
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -54,10 +54,10 @@ set_session('DOUBLER_UID', "");
 if (empty($DOUBLER_UID)) $DOUBLER_UID = 0;
 
 // Check for doubles which we can pay out
-$min = bigintval($_CONFIG['doubler_min'] * 2);
+$min = bigintval(getConfig('doubler_min') * 2);
 $result_total = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark
 FROM "._MYSQL_PREFIX."_doubler AS d
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS u
 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark", array($DOUBLER_POINTS, $min), __FILE__, __LINE__);
@@ -65,17 +65,17 @@ ORDER BY d.timemark", array($DOUBLER_POINTS, $min), __FILE__, __LINE__);
 // Check for accounts with limitation
 $result_main = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark
 FROM "._MYSQL_PREFIX."_doubler AS d
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS u
 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark
-LIMIT %d", array($DOUBLER_POINTS, $min, $_CONFIG['doubler_max_sent']), __FILE__, __LINE__);
+LIMIT %d", array($DOUBLER_POINTS, $min, getConfig('doubler_max_sent')), __FILE__, __LINE__);
 
 // Do we have entries found?
-if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y")) || ((SQL_NUMROWS($result_main) == $_CONFIG['doubler_group_sent']) && ($_CONFIG['doubler_sent_all'] == "N"))) {
+if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y")) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') == "N"))) {
 	// Switch to matching SQL resource
 	$result_load = $result_main;
-	if ((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y")) $result_load = $result_total;
+	if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y")) $result_load = $result_total;
 
 	// At least one account was found
 	while(list($id, $uid, $points, $ip, $time) = SQL_FETCHROW($result_load)) {
@@ -97,9 +97,9 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
 			}
 
 			// Exclude webmaster from doubling...
-			if ($uid != $_CONFIG['doubler_uid']) {
+			if ($uid != getConfig('doubler_uid')) {
 				// Add points
-				ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
+				ADD_POINTS_REFSYSTEM(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $uid, $points, false, "0", false, "direct");
 			} // END - if
 
 			// Set entry as "payed"
@@ -108,7 +108,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
 
 			$OK = false;
 			// Check for jackpot inclusion in doubling process
-			if (($jackpot > 0) && ($jackpot >= $points) && ($_CONFIG['doubler_jackpot'] == "Y")) {
+			if (($jackpot > 0) && ($jackpot >= $points) && (getConfig('doubler_jackpot') == "Y")) {
 				// Subtract points from jackpot
 				SUB_JACKPOT($points);
 				$jackpot -= $points;
@@ -118,9 +118,9 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
 			} // END - if
 
 			// Exclude also webmaster's ID in taking points from webmaster's account
-			if (($user > 0) && ($user >= $points) && (!$OK) && ($_CONFIG['doubler_uid'] > 0) && ($uid != $_CONFIG['doubler_uid'])) {
+			if (($user > 0) && ($user >= $points) && (!$OK) && (getConfig('doubler_uid') > 0) && ($uid != getConfig('doubler_uid'))) {
 				// Add points to used points
-				SUB_POINTS($_CONFIG['doubler_uid'], $points);
+				SUB_POINTS("doubler_payout", getConfig('doubler_uid'), $points);
 
 				// Okay, done!
 				$OK = true;