X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fdoubler_mails.php;h=91f3988d91f3b71b8da61fc987eb956c184dfda5;hb=ec9f020e34a9f2029a2ea0969564dda015beca8a;hp=975fae07e96946c894b5887f3ce3e9a5ded1b5e4;hpb=8f14df8c3232a31917df0ac57363dbd6e975c147;p=mailer.git

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 975fae07e9..91f3988d91 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,18 +39,24 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif (!isExtensionActive('doubler')) {
+	// Do not execute when extension is absent
+	return;
+} elseif (!isHtmlOutputMode()) {
+	// Do not execute when script is in CSS mode
 	return;
 }
 
-// Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
-
 // Initialize variables
-$jackpot = '0'; $user = '0';
-if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
+$jackpotPoints = '0';
+$userPoints = '0';
+
+// @TODO Can this be rewritten to a filter?
+if (isExtensionActive('jackpot')) {
+	$jackpotPoints = getJackpotPoints();
+} // END - if
 
 // 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 +66,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
@@ -108,10 +112,12 @@ LIMIT {?doubler_max_sent?}",
 	), __FILE__, __LINE__);
 
 // Do we have entries found?
-if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
+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;
-	if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) $result_load = $result_total;
+	if ((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')) {
+		$result_load = $result_total;
+	} // END - if
 
 	// At least one account was found
 	while ($content = SQL_FETCHARRAY($result_load)) {
@@ -123,7 +129,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 +152,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 +181,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'    => $content['points'],
-				// Timemark
-				'timemark'  => generateDateTime($content['timemark'], 2),
-				// IP number when the member submitted the doubling form
-				'remote_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'], '{--MEMBER_DOUBLER_SUBJECT--}', $message);
 		} // END - if
 	} // END - while
 } // END - if