Mahor rewrite:

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

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index e44b30ef7132fca156191c3fd771535e12124610..19e15b1531acd13e56e22f8a3a9bf1563e20c2ed 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 ($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
@@ -86,19 +86,17 @@ if ($cnt < $_CONFIG['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",
-                                array(bigintval($uid)), __FILE__, __LINE__);
+                               $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?
-                               if (SQL_NUMROWS($result_user) == 1)
-                               {
+                               if (SQL_NUMROWS($result_user) == 1) {
                                        // The final receiver does exists so we can continue...
                                        list($sname, $fname, $email) = SQL_FETCHROW($result_user);
                                        //* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
-                                       if (REMOVE_RECEIVER($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == "done")
-                                       {
+                                       if (REMOVE_RECEIVER($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == "done") {
                                                // Replace text variables
                                                foreach ($REPLACER as $key => $value) {
                                                        if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
@@ -129,56 +127,49 @@ if ($cnt < $_CONFIG['max_send']) {
                                                // Count one up and remove entry from dummy array
                                                $cnt++; unset($dummy[$key]);
 
-                                               if (GET_EXT_VERSION("user") >= "0.1.4")
-                                               {
+                                               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",
-                                                        array(bigintval($uid)), __FILE__, __LINE__);
-                                               }
+                                                       $result = 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 (($cnt >= getConfig('max_send')) || (SELECTION_COUNT($dummy) == 0)) {
                                                        // Yes, we have
                                                        //* DEBUG: */ echo "*EXIT/L:".__LINE__."<br />";
                                                        break;
-                                               }
-                                       }
-                               }
+                                               } // END - if
+                                       } // END - if
+                               } // END - if
 
                                // Free some memory
                                SQL_FREERESULT($result_user);
                        }
 
                        // Update mediadata if version is 0.0.4 or higher
-                       if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-                       {
+                       if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                                // Update entry (or add missing
                                $P = $cnt;
                                if (!empty($cnt2) && empty($cnt)) $P = $cnt2;
                                //* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+<br />";
                                MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
-                       }
+                       } // END - if
 
                        // Close sending system
                        //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-<br />";
-                       if (SELECTION_COUNT($dummy) == 0)
-                       {
+                       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__);
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
                                // Update mediadata if version is 0.0.4 or higher
-                               if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-                               {
+                               if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                                        // Update entry (or add missing)
                                        //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                        MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
-                               }
-                       }
-                        elseif ($cnt >= $_CONFIG['max_send'])
-                       {
+                               } // END - if
+                       } elseif ($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__);