X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-bonus.php;h=4753a3a01a000438af6ab930de8cfcb79e1911ec;hp=c525382125dfd9d03d3badbc1faf7d81b3b5f340;hb=508228c85fba8448d00865b1639cb8cd7a69e457;hpb=c08df20b10d0771e7f749d7afbe1f76be9f1b028
diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index c525382125..4753a3a01a 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Sendet freigegebene Bonus-Mails aus dem Pool *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: 856 $ *
+ * $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 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -38,7 +43,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")) {
@@ -46,15 +51,16 @@ if (defined('__DAILY_RESET')) {
return false;
}
+// Need this here
// Only send bonus mail when bonus extension is active and maximum send-mails is not reached
-if ($cnt < $_CONFIG['max_send']) {
+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) {
@@ -65,7 +71,7 @@ if ($cnt < $_CONFIG['max_send']) {
$DATA['url'] = COMPILE_CODE($DATA['url']);
// Message is active in queue
- $result_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
@@ -86,7 +92,7 @@ if ($cnt < $_CONFIG['max_send']) {
foreach ($RECEIVERS as $key => $uid) {
// Load personal data
//* DEBUG: */ echo "*L:".__LINE__."/".$uid."*
";
- $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?
@@ -98,7 +104,7 @@ if ($cnt < $_CONFIG['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
@@ -113,28 +119,28 @@ if ($cnt < $_CONFIG['max_send']) {
);
// Prepare the mail
- $msg = LOAD_EMAIL_TEMPLATE("bonus-mail", $content, $uid);
+ $mailText = LOAD_EMAIL_TEMPLATE("bonus-mail", $content, $uid);
// Send mail away
if (isset($DATA['html_msg'])) {
// Send HTML?
- SEND_EMAIL($email, $DATA['subject'], $msg, $DATA['html_msg']);
+ SEND_EMAIL($email, $DATA['subject'], $mailText, $DATA['html_msg']);
} else {
// No HTML mail!
- SEND_EMAIL($email, $DATA['subject'], $msg);
+ SEND_EMAIL($email, $DATA['subject'], $mailText);
}
// Count one up and remove entry from dummy array
- $cnt++; unset($dummy[$key]);
+ $GLOBALS['pool_cnt']++; unset($dummy[$key]);
if (GET_EXT_VERSION("user") >= "0.1.4") {
// Update mails received for receiver
- $result = 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
// Do we have send maximum mails?
- if (($cnt >= $_CONFIG['max_send']) || (SELECTION_COUNT($dummy) == 0)) {
+ if (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || (SELECTION_COUNT($dummy) == 0)) {
// Yes, we have
//* DEBUG: */ echo "*EXIT/L:".__LINE__."
";
break;
@@ -149,8 +155,8 @@ if ($cnt < $_CONFIG['max_send']) {
// Update mediadata if version is 0.0.4 or higher
if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
// Update entry (or add missing
- $P = $cnt;
- if (!empty($cnt2) && empty($cnt)) $P = $cnt2;
+ $P = $GLOBALS['pool_cnt'];
+ if (!empty($cnt2) && empty($GLOBALS['pool_cnt'])) $P = $cnt2;
//* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+
";
MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
} // END - if
@@ -159,8 +165,8 @@ if ($cnt < $_CONFIG['max_send']) {
//* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-
";
if (SELECTION_COUNT($dummy) == 0) {
// Queue reached!
- $result_done = 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__);
+ 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__."*
";
// Update mediadata if version is 0.0.4 or higher
@@ -169,13 +175,13 @@ if ($cnt < $_CONFIG['max_send']) {
//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*
";
MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
} // END - if
- } elseif ($cnt >= $_CONFIG['max_send']) {
+ } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
// Update bonus pool
- $result_done = 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__."";
+ 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__."";
//* DEBUG: */ print_r($dummy);
- //* DEBUG: */ echo "
\n!!!
";
+ //* DEBUG: */ echo "\n!!!
";
break;
}
}
@@ -183,10 +189,10 @@ if ($cnt < $_CONFIG['max_send']) {
// Free memory
SQL_FREERESULT($result_bonus);
-}
-// Remove message (IMPORTANT!)
-unset($msg);
+ // Remove variable
+ unset($mailText);
+}
//
?>