X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fdoubler_mails.php;h=e1620270bb5eeac782fb0f53526f2a3de1030ea9;hb=d1d88135518af4ce96c824bd9e117d053355dcda;hp=7fa1ae34a1a4aecc22c955ab843c85e8796b22d7;hpb=4867976d90c806a03bb0848886f1e175c68cf3a4;p=mailer.git

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 7fa1ae34a1..e1620270bb 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -63,8 +63,8 @@ if ($DOUBLER_POINTS == '0') {
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestParameter('DOUBLER_USERID');
-unsetPostRequestParameter('DOUBLER_USERID');
+unsetGetRequestElement('DOUBLER_USERID');
+unsetPostRequestElement('DOUBLER_USERID');
 setSession('DOUBLER_USERID', '');
 if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
@@ -76,42 +76,48 @@ FROM
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_user_data` AS u
 ON
-	d.userid=u.userid
+	d.`userid`=u.`userid`
 WHERE
-	u.`status`='CONFIRMED' AND
-	d.points <= %s AND
-	d.points >= ({?doubler_min?} * 2) AND
-	d.completed='N' AND
-	d.is_ref='N'
+	u.`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . " AND
+	d.`points` <= %s AND
+	d.`points` >= ({?doubler_min?} * 2) AND
+	d.`completed`='N' AND
+	d.`is_ref`='N'
 ORDER BY
-	d.timemark ASC",
+	d.`timemark` ASC",
 	array(
 		$DOUBLER_POINTS
 	), __FILE__, __LINE__);
 
 // Check for accounts with limitation
 $result_main = SQL_QUERY_ESC("SELECT
-	d.id, d.userid, d.points, d.remote_ip, d.timemark
+	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
 ON
-	d.userid=u.userid
+	d.`userid`=u.`userid`
 WHERE
-	u.`status`='CONFIRMED' AND
-	d.points <= %s AND
-	d.points >= ({?doubler_min?} * 2) AND
-	d.completed='N' AND
-	d.is_ref='N'
+	u.`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . " AND
+	d.`points` <= %s AND
+	d.`points` >= ({?doubler_min?} * 2) AND
+	d.`completed`='N' AND
+	d.`is_ref`='N'
 ORDER BY
-	d.timemark ASC
+	d.`timemark` ASC
 LIMIT {?doubler_max_sent?}",
 	array(
 		$DOUBLER_POINTS
 	), __FILE__, __LINE__);
 
-// Do we have entries found?
+// Are there entries found?
 if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
 	// Switch to matching SQL resource
 	$result_load = $result_main;
@@ -124,54 +130,51 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
 		// Only double when points are enougth!
 		if ($DOUBLER_POINTS >= $content['points']) {
 			// Check for his ref points
-			$ref = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'");
+			$refPoints = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', FALSE, " AND `completed`='N' AND `is_ref`='Y'");
 
 			// Zero refid when empty (might be helpful!)
-			if (empty($ref)) $ref = '0';
+			if (empty($refPoints)) {
+				$refPoints = '0';
+			} // END - if
 
-			if (($ref > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($ref))) {
-				// Referal points found so add them and set line(s) to completed='Y'
-				$content['points'] += $ref;
+			if (($refPoints > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($refPoints))) {
+				// Referral points found so add them and set line(s) to completed='Y'
+				$content['points'] += $refPoints;
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
 					array(bigintval($content['userid'])), __FILE__, __LINE__);
 			} else {
-				// No referal points found
-				$ref = '0';
+				// No referral points found
+				$refPoints = '0';
 			}
 
 			// Exclude webmaster from doubling...
-			if ($content['userid'] != getConfig('doubler_userid')) {
+			if ($content['userid'] != getDoublerUserid()) {
 				// Add points
-				addPointsThroughReferalSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
+				initReferralSystem();
+				addPointsThroughReferralSystem(sprintf("doubler_%s", strtolower(getDoublerSendMode())), $content['userid'], $content['points']);
 			} // END - if
 
 			// Set entry as "payed"
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `id`=%s LIMIT 1",
 				array(bigintval($content['id'])), __FILE__, __LINE__);
 
-			$okay = false;
+			$okay = FALSE;
 
 			// Check for jackpot inclusion in doubling process
 			if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
 				// Subtract points from jackpot
-				subtractPointsFromJackpot($content['points']);
+				$okay = subtractPointsFromJackpot($content['points']);
 				$jackpotPoints -= $content['points'];
-
-				// Okay, done!
-				$okay = true;
 			} // END - if
 
 			// Exclude also webmaster's id in taking points from webmaster's account
-			if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
-				// Add points to used points
-				subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
-
-				// Okay, done!
-				$okay = true;
+			if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === FALSE) && (getDoublerUserid() > 0) && ($content['userid'] != getDoublerUserid())) {
+				// Subtract points
+				$okay = subtractPoints('doubler_payout', getDoublerUserid(), $content['points']);
 			} // END - if
 
 			// Update doubler's account only when others are not updated
-			if ($okay === false) {
+			if ($okay === FALSE) {
 				// Add points to used doubler points
 				updateConfiguration('doubler_used', $content['points'], '+');
 			} // END - if