Damn typo fixed... ;-)

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

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 078a2210730d249ac2309df3c570d7bff1700e87..928808d36921313c2a207219bdf087e17ac247e5 100644 (file)
--- 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::                                                        $ *
+ * $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 ($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 ($GLOBALS['pool_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 +92,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?
@@ -98,7 +104,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
 
@@ -129,7 +135,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 
                                                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
 
@@ -159,7 +165,7 @@ if ($GLOBALS['pool_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",
+                               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 />";
 
@@ -171,11 +177,11 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                } // END - if
                        } 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;
                        }
                }