X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-bonus.php;h=d52b7a64b173590884d410ab7a5c13dd1e055212;hb=5f5a73c72457ea761906640dc3d29749301102f9;hp=9af04721bdbd131bb6739710e7606795ce8fb5d5;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672;p=mailer.git

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 9af04721bd..d52b7a64b1 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Don't run on daily reset
-if (defined('__DAILY_RESET')) {
+if (isResetModeEnabled()) {
 	// Skip here
 	return false;
 } elseif (!EXT_IS_ACTIVE("bonus")) {
@@ -47,17 +47,15 @@ if (defined('__DAILY_RESET')) {
 }
 
 // Need this here
-global $REPLACER;
-
 // Only send bonus mail when bonus extension is active and maximum send-mails is not reached
 if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 	// Do we need to send out bonus mails?
 	if (EXT_IS_ACTIVE("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_NUMROWS($result_bonus) > 0) {
@@ -68,7 +66,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 			$DATA['url'] = COMPILE_CODE($DATA['url']);
 
 			// Message is active in queue
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='QUEUE' WHERE id=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='QUEUE' WHERE id=%s LIMIT 1",
 				array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
 			// "Explode" all receivers into an array
@@ -89,7 +87,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 			foreach ($RECEIVERS as $key => $uid) {
 				// Load personal data
 				//* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
-				$result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+				$result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 					array(bigintval($uid)), __FILE__, __LINE__);
 
 				// Is his data available?
@@ -101,7 +99,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 					// Mark this user as "spammed" ;-) And place a line for him...
 					if (REMOVE_RECEIVER($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == "done") {
 						// Replace text variables
-						foreach ($REPLACER as $key => $value) {
+						foreach ($GLOBALS['replacer'] as $key => $value) {
 							if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
 						} // END - foreach
 
@@ -132,7 +130,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 
 						if (GET_EXT_VERSION("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",
+							SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",
 								array(bigintval($uid)), __FILE__, __LINE__);
 						} // END - if
 
@@ -162,7 +160,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 			//* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-<br />";
 			if (SELECTION_COUNT($dummy) == 0) {
 				// Queue reached!
-				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
+				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
 					array(bigintval($DATA['id'])), __FILE__, __LINE__);
 				//* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
@@ -174,7 +172,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 				} // END - if
 			} elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
 				// Update bonus pool
-				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
+				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
 					array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
 				//* DEBUG: */ echo "*L:".__LINE__."<pre>";
 				//* DEBUG: */ print_r($dummy);