X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-bonus.php;h=b127dac6652dc5e2f656e95b58b81a3616db3b19;hb=840659bfdfe0d0cf891135382818cdc134bf6f2e;hp=92c76082795553f990de4275e59a281cc2d4ccf8;hpb=6a2220d4121ad5bd7d7e0135d95005ce52a2d02d;p=mailer.git

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 92c7608279..b127dac665 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -55,10 +55,10 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 	// Do we need to send out bonus mails?
 	if (isExtensionActive('html_mail')) {
 		//                                 0        1        2          3          4        5          6            7         8        9            10           11
-		$result_bonus = SQL_QUERY("SELECT `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `html_msg` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
+		$result_bonus = SQL_QUERY("SELECT `id`,`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send`,`html_msg` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
 	} else {
 		//                                 0        1        2          3          4        5          6            7         8        9            10
-		$result_bonus = SQL_QUERY("SELECT `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
+		$result_bonus = SQL_QUERY("SELECT `id`,`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
 	}
 
 	if (!SQL_HASZERONUMS($result_bonus)) {
@@ -80,7 +80,7 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 				// No users left
 				$receivers = array(0);
 			}
-			$dummy = $receivers;
+			$temporaryReceivers = $receivers;
 
 			// Now, if we are good little boys and girls Santa Claus left us some user-ids.
 			// We can now send mails to them...
@@ -91,7 +91,7 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 					//* DEBUG: */ debugOutput('OK!/L:'.__LINE__);
 
 					// Remove receiver from list
-					$status = removeReceiver($dummy, $key, $userid, $mailData['id'], $mailData['id'], true);
+					$status = removeReceiver($temporaryReceivers, $key, $userid, $mailData['id'], $mailData['id'], true);
 
 					// Did it work?
 					switch ($status) {
@@ -109,16 +109,16 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 							}
 
 							// Count one up and remove entry from dummy array
-							$GLOBALS['pool_cnt']++; unset($dummy[$key]);
+							$GLOBALS['pool_cnt']++; unset($temporaryReceivers[$key]);
 
 							if (isExtensionInstalledAndNewer('user', '0.1.4')) {
 								// Update mails received for receiver
 								SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1",
-								array(bigintval($userid)), __FILE__, __LINE__);
+									array(bigintval($userid)), __FILE__, __LINE__);
 							} // END - if
 
 							// Do we have send maximum mails?
-							if (($GLOBALS['pool_cnt'] >= getMaxSend()) || (countSelection($dummy) == 0)) {
+							if (($GLOBALS['pool_cnt'] >= getMaxSend()) || (countSelection($temporaryReceivers) == 0)) {
 								// Yes, we have
 								//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__);
 								break;
@@ -142,8 +142,8 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 			} // END - if
 
 			// Close sending system
-			//* DEBUG: */ debugOutput('-L:'.__LINE__.'/'.countSelection($dummy).'-');
-			if (countSelection($dummy) == 0) {
+			//* DEBUG: */ debugOutput('-L:'.__LINE__.'/'.countSelection($temporaryReceivers).'-');
+			if (countSelection($temporaryReceivers) == 0) {
 				// Queue reached!
 				SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_bonus`
@@ -175,11 +175,11 @@ WHERE
 	`id`=%s
 LIMIT 1",
 					array(
-						countSelection($dummy),
-						implode(';', $dummy),
+						countSelection($temporaryReceivers),
+						implode(';', $temporaryReceivers),
 						bigintval($mailData['id'])
 					), __FILE__, __LINE__);
-				//* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($dummy, true).'</pre>!!!');
+				//* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($temporaryReceivers, true).'</pre>!!!');
 				break;
 			}
 		} // END - while