X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmails%2Fdoubler_mails.php;h=85d852979a940eb045b7a93c1ff497b9872c6c8f;hp=9101070df0ec572b15a1c66be8ceddf1b8e04a0f;hb=71c07e991fc7f5393317f4d9adf4ecdbc26b9aa3;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 9101070df0..85d852979a 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -45,14 +45,14 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // Initialize variables
-$jackpot = '0'; $user = '0';
-if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
+$jackpotPoints = '0'; $userPoints = '0';
+if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints();
 
 // Get total points of the doubler itself
-$DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT();
+$DOUBLER_POINTS = getDoublerTotalPointsLeft();
 if ($DOUBLER_POINTS == '0') {
 	// Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...)
 	return;
@@ -62,7 +62,7 @@ if ($DOUBLER_POINTS == '0') {
 unsetGetRequestParameter('DOUBLER_UID');
 unsetPostRequestParameter('DOUBLER_UID');
 setSession('DOUBLER_UID', '');
-if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
+if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
 // Check for doubles which we can pay out
 $result_total = SQL_QUERY_ESC("SELECT
@@ -123,7 +123,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 			// Zero refid when empty (might be helpful!)
 			if (empty($ref)) $ref = '0';
 
-			if (($ref > 0) && ($GLOBALS['doubler_userid'] == $content['userid']) && (!empty($ref))) {
+			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;
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
@@ -146,17 +146,17 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 			$okay = false;
 
 			// Check for jackpot inclusion in doubling process
-			if (($jackpot > 0) && ($jackpot >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
+			if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
 				// Subtract points from jackpot
 				subtractPointsFromJackpot($content['points']);
-				$jackpot -= $content['points'];
+				$jackpotPoints -= $content['points'];
 
 				// Okay, done!
 				$okay = true;
 			} // END - if
 
 			// Exclude also webmaster's id in taking points from webmaster's account
-			if (($user > 0) && ($user >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
+			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']);
 
@@ -175,20 +175,11 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 			$DOUBLER_POINTS -= $content['points'];
 
 			// Prepare array
-			$content = array(
-				// Doubler transmission id
-				'id'     => $content['id'],
-				// Doubled points
-				'points' => translateComma($content['points']),
-				// Timemark
-				'when'   => generateDateTime($content['timemark'], 2),
-				// IP number when the member submitted the doubling form
-				'ip'     => $content['remote_ip'],
-			);
+			$content['timemark'] = generateDateTime($content['timemark'], 2);
 
 			// Load mail template and send mail away...
 			$message = loadEmailTemplate('member_doubler', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('DOUBLER_MEMBER_SUBJECT'), $message);
+			sendEmail($content['userid'], '{--DOUBLER_MEMBER_SUBJECT--}', $message);
 		} // END - if
 	} // END - while
 } // END - if