Fix for undefined variable cnt in mails sending pool (Closed: #0000003)

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

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 264b70857d246c8ba472541935121f778107621f..078a2210730d249ac2309df3c570d7bff1700e87 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -47,7 +47,7 @@ if (defined('__DAILY_RESET')) {
 }
 
 // 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
@@ -113,19 +113,19 @@ 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
@@ -134,7 +134,7 @@ if ($cnt < $_CONFIG['max_send']) {
                                                } // 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__."<br />";
                                                        break;
@@ -149,8 +149,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."+<br />";
                                MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
                        } // END - if
@@ -160,7 +160,7 @@ if ($cnt < $_CONFIG['max_send']) {
                        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__);
+                                       array(bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
                                // Update mediadata if version is 0.0.4 or higher
@@ -169,7 +169,7 @@ if ($cnt < $_CONFIG['max_send']) {
                                        //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                        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__);
@@ -183,10 +183,10 @@ if ($cnt < $_CONFIG['max_send']) {
 
        // Free memory
        SQL_FREERESULT($result_bonus);
-}
 
-// Remove message (IMPORTANT!)
-unset($msg);
+       // Remove variable
+       unset($mailText);
+}
 
 //
 ?>