X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fdoubler_mails.php;h=9101070df0ec572b15a1c66be8ceddf1b8e04a0f;hb=917341a751e3792d9bb95aa344e3c0adfcf402d4;hp=75d4b46c5cdca4b5a91f6aef6362333ba7e14eee;hpb=f2c43b993e03f90202044a0c2ea0abd0866ec6ee;p=mailer.git

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 75d4b46c5c..9101070df0 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/16/2005 *
- * ===============                              Last change: 01/21/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 02/16/2005 *
+ * ===================                          Last change: 01/21/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : doubler_mails.php                                 *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,46 +48,63 @@ if (!defined('__SECURITY')) {
 if (getOutputMode() != 0) return;
 
 // Initialize variables
-$jackpot = 0; $user = 0;
+$jackpot = '0'; $user = '0';
 if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
 
 // Get total points of the doubler itself
 $DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT();
-if ($DOUBLER_POINTS == 0) {
+if ($DOUBLER_POINTS == '0') {
 	// Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...)
 	return;
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestElement('DOUBLER_UID');
-unsetPostRequestElement('DOUBLER_UID');
+unsetGetRequestParameter('DOUBLER_UID');
+unsetPostRequestParameter('DOUBLER_UID');
 setSession('DOUBLER_UID', '');
-if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = 0;
+if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
 
 // Check for doubles which we can pay out
-$result_total = SQL_QUERY_ESC("SELECT 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
-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",
+$result_total = SQL_QUERY_ESC("SELECT
+	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
+WHERE
+	u.`status`='CONFIRMED' AND
+	d.points <= %s AND
+	d.points >= ({?doubler_min?} * 2) AND
+	d.completed='N' AND
+	d.is_ref='N'
+ORDER BY
+	d.timemark ASC",
 	array(
-		$DOUBLER_POINTS,
-		getConfig(('doubler_min') * 2)
+		$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
-FROM `{?_MYSQL_PREFIX?}_doubler` AS d
-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",
+$result_main = SQL_QUERY_ESC("SELECT
+	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
+WHERE
+	u.`status`='CONFIRMED' AND
+	d.points <= %s AND
+	d.points >= ({?doubler_min?} * 2) AND
+	d.completed='N' AND
+	d.is_ref='N'
+ORDER BY
+	d.timemark ASC
+LIMIT {?doubler_max_sent?}",
 	array(
-		$DOUBLER_POINTS,
-		getConfig(('doubler_min') * 2),
-		getConfig('doubler_max_sent')
+		$DOUBLER_POINTS
 	), __FILE__, __LINE__);
 
 // Do we have entries found?
@@ -103,7 +121,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 			$ref = 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($ref)) $ref = '0';
 
 			if (($ref > 0) && ($GLOBALS['doubler_userid'] == $content['userid']) && (!empty($ref))) {
 				// Referal points found so add them and set line(s) to completed='Y'
@@ -112,7 +130,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 					array(bigintval($content['userid'])), __FILE__, __LINE__);
 			} else {
 				// No referal points found
-				$ref = 0;
+				$ref = '0';
 			}
 
 			// Exclude webmaster from doubling...