More language strings rewritten

[mailer.git] / inc / pool / pool-bonus.php

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 19e15b1531acd13e56e22f8a3a9bf1563e20c2ed..7c295b2f340003af05a8499a766fb426cf1b2d42 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -46,15 +46,18 @@ if (defined('__DAILY_RESET')) {
        return false;
 }
 
+// Need this here
+global $REPLACER;
+
 // Only send bonus mail when bonus extension is active and maximum send-mails is not reached
-if ($cnt < getConfig('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 +68,7 @@ if ($cnt < getConfig('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 +89,7 @@ if ($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?
@@ -113,28 +116,28 @@ if ($cnt < getConfig('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 >= getConfig('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__."<br />";
                                                        break;
@@ -149,8 +152,8 @@ if ($cnt < getConfig('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."+<br />";
                                MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
                        } // END - if
@@ -159,8 +162,8 @@ if ($cnt < getConfig('max_send')) {
                        //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-<br />";
                        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__."*<br />";
 
                                // Update mediadata if version is 0.0.4 or higher
@@ -169,13 +172,13 @@ if ($cnt < getConfig('max_send')) {
                                        //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                        MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
                                } // END - if
-                       } elseif ($cnt >= getConfig('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__."<PRE>";
+                               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);
-                               //* DEBUG: */ echo "</PRE>\n!!!<br />";
+                               //* DEBUG: */ echo "</pre>\n!!!<br />";
                                break;
                        }
                }
@@ -183,10 +186,10 @@ if ($cnt < getConfig('max_send')) {
 
        // Free memory
        SQL_FREERESULT($result_bonus);
-}
 
-// Remove message (IMPORTANT!)
-unset($msg);
+       // Remove variable
+       unset($mailText);
+}
 
 //
 ?>