Inconsistency between echo and print() fixed to OUTPUT_HTML() (not all)

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

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 1bc67ec2aa436caad11d90dc837e6f54ca88cfdd..6793f63f4bcdeb6fba7df1ea9e50b92be191b017 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -91,7 +91,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                        // We can now send mails to them...
                        foreach ($RECEIVERS as $key => $uid) {
                                // Load personal data
-                               //* DEBUG: */ echo "*L:".__LINE__.'/'.$uid."*<br />";
+                               //* DEBUG: */ OUTPUT_HTML("*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__);
 
@@ -99,7 +99,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                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 />";
+                                       //* DEBUG: */ OUTPUT_HTML("OK!/L:".__LINE__."<br />");
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
                                        if (removeReceiver($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == 'done') {
@@ -142,7 +142,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                                // Do we have send maximum mails?
                                                if (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || (countSelection($dummy) == 0)) {
                                                        // Yes, we have
-                                                       //* DEBUG: */ echo "*EXIT/L:".__LINE__."<br />";
+                                                       //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__."<br />");
                                                        break;
                                                } // END - if
                                        } // END - if
@@ -157,31 +157,31 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                // Update entry (or add missing
                                $P = $GLOBALS['pool_cnt'];
                                if (!empty($cnt2) && empty($GLOBALS['pool_cnt'])) $P = $cnt2;
-                               //* DEBUG: */ echo "+MEDIA/L:".__LINE__.'/'.$P."+<br />";
+                               //* DEBUG: */ OUTPUT_HTML("+MEDIA/L:".__LINE__.'/'.$P."+<br />");
                                MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), 'add', $P);
                        } // END - if
 
                        // Close sending system
-                       //* DEBUG: */ echo "-L:".__LINE__.'/'.countSelection($dummy)."-<br />";
+                       //* DEBUG: */ OUTPUT_HTML("-L:".__LINE__.'/'.countSelection($dummy)."-<br />");
                        if (countSelection($dummy) == 0) {
                                // Queue reached!
                                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 />";
+                               //* DEBUG: */ OUTPUT_HTML("*L:".__LINE__."*<br />");
 
                                // Update mediadata if version is 0.0.4 or higher
                                if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
                                        // Update entry (or add missing)
-                                       //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
+                                       //* DEBUG: */ OUTPUT_HTML("*MEDIA/L:".__LINE__."*<br />");
                                        MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), 'add', 1);
                                } // END - if
                        } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
                                // Update bonus pool
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET `data_type`='NEW', `target_send`=%s, `receivers`='%s' WHERE `id`=%s LIMIT 1",
                                array(countSelection($dummy), implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
-                               //* DEBUG: */ echo "*L:".__LINE__."<pre>";
-                               //* DEBUG: */ print_r($dummy);
-                               //* DEBUG: */ echo "</pre>\n!!!<br />";
+                               //* DEBUG: */ OUTPUT_HTML("*L:".__LINE__."<pre>");
+                               //* DEBUG: */ OUTPUT_HTML(print_r($dummy, true));
+                               //* DEBUG: */ OUTPUT_HTML("</pre>\n!!!<br />");
                                break;
                        }
                }