A *lot* more code-cleanups, errors in CSS fixed (missing brackets) and frameset suppo...

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

diff --git a/inc/pool-update.php b/inc/pool-update.php
index fabbcbdb0e1093121092b82e4555fa8b4ff157e0..fc71a8ae81f281e9cf156b54fde61c7421895554 100644 (file)
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -60,7 +60,7 @@ if (SQL_NUMROWS($result_main) > 0)
        while ($DATA = SQL_FETCHROW($result_main))
        {
                // Check fetched data for HTML
-               $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = "N";
+               $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = 'N';
 
                // Compile URL and subject line
                $DATA[7] = COMPILE_CODE($DATA[7]);
@@ -97,7 +97,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                 array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?
-                               //* DEBUG: */ echo "*L:".__LINE__."/".SQL_NUMROWS($result_user)."*<BR>";
+                               //* DEBUG: */ echo "*L:".__LINE__."/".SQL_NUMROWS($result_user)."*<br />";
                                if (SQL_NUMROWS($result_user) == 1)
                                {
                                        // The final receiver does exists so we can continue...
@@ -111,7 +111,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                         array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
 
                                        // If there's no stats entry add it!
-                                       //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<BR>";
+                                       //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
                                        if (SQL_NUMROWS($result_stats) == 0)
                                        {
                                                // No entry was found, so we add him!
@@ -123,7 +123,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                 array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
                                        }
 
-                                       //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<BR>";
+                                       //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
                                        if (SQL_NUMROWS($result_stats) == 1)
                                        {
                                                // We got one!
@@ -131,7 +131,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                SQL_FREERESULT($result_stats);
 
                                                // Mark this user as "spammed" ;-) And place a line for him...
-                                               //* DEBUG: */ echo "?L:".__LINE__."/".$DUMMY."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?<BR>";
+                                               //* DEBUG: */ echo "?L:".__LINE__."/".$DUMMY."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?<br />";
                                                switch (REMOVE_RECEIVER($DUMMY, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id)))
                                                {
                                                case "done":
@@ -162,25 +162,25 @@ if (SQL_NUMROWS($result_main) > 0)
                                                        if (GET_EXT_VERSION("mediadata") >= "0.0.4")
                                                        {
                                                                // Update entry (or add missing)
-                                                               //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<BR>";
+                                                               //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                                                MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), "add", 1);
                                                        }
 
                                                        // And count up the mail
                                                        $cnt++;
-                                                       //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."*<BR>";
+                                                       //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."*<br />";
                                                        break;
 
                                                case "already":
                                                        // Entry already found, but we still count one up!
                                                        $cnt++;
-                                                       //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."<BR>";
+                                                       //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$cnt."<br />";
                                                        break;
                                                }
                                        }
 
                                        // Do we have reached the maximum to send mails? || ($CONFIG['max_send'] >= $cnt)
-                                       //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*<BR>";
+                                       //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*<br />";
                                        if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA[0]))
                                        {
                                                // Yes we do, so we notify admin and sender about fully sent mail!
@@ -224,11 +224,11 @@ if (SQL_NUMROWS($result_main) > 0)
                                                if (GET_EXT_VERSION("mediadata") >= "0.0.4")
                                                {
                                                        // Update entry (or add missing)
-                                                       //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<BR>";
+                                                       //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                                        MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), "add", 1);
                                                }
 
-                                               //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$P."<BR>";
+                                               //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$P."<br />";
                                                break;
                                        }
                                        // Do we have send maximum mails?
@@ -240,7 +240,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%d LIMIT 1",
                                                 array(implode(";", $DUMMY), bigintval($DATA[0])), __FILE__, __LINE__);
 
-                                               //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<BR>";
+                                               //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
                                                break;
                                        }
                                }
@@ -259,14 +259,14 @@ if (SQL_NUMROWS($result_main) > 0)
                                                {
                                                        // User does not exists, pay points back
                                                        $POINTS = GET_PAY_POINTS($DATA[5]);
-                                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET points=points+%s WHERE userid=%d AND ref_depth='0' LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET points=points+%s WHERE userid=%d AND ref_depth=0 LIMIT 1",
                                                         array($POINTS, bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                        // Update mediadata as well
                                                        if (GET_EXT_VERSION("mediadata") >= "0.0.4")
                                                        {
                                                                // Update database
-                                                               //* DEBUG: */ echo "*MEDIA/L:".__LINE__."/".$POINTS."*<BR>";
+                                                               //* DEBUG: */ echo "*MEDIA/L:".__LINE__."/".$POINTS."*<br />";
                                                                MEDIA_UPDATE_ENTRY(array("total_points"), "add", $POINTS);
                                                        }
 
@@ -381,7 +381,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
                        foreach ($RECEIVERS as $key=>$uid)
                        {
                                // Load personal data
-                               //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<BR>";
+                               //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
                                $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
                                 array(bigintval($uid)), __FILE__, __LINE__);
 
@@ -390,7 +390,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
                                {
                                        // The final receiver does exists so we can continue...
                                        list($sname, $fname, $email) = SQL_FETCHROW($result_user);
-                                       //* DEBUG: */ echo "OK!/L:".__LINE__."<BR>";
+                                       //* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
                                        if (REMOVE_RECEIVER($DUMMY, $key, $uid, $DATA[0], $DATA[0], true) == "done")
@@ -415,7 +415,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
                                                if (($cnt >= $CONFIG['max_send']) || (SELECTION_COUNT($DUMMY) == 0))
                                                {
                                                        // Yes, we have
-                                                       //* DEBUG: */ echo "*EXIT/L:".__LINE__."<BR>";
+                                                       //* DEBUG: */ echo "*EXIT/L:".__LINE__."<br />";
                                                        break;
                                                }
                                        }
@@ -431,24 +431,24 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
                                // Update entry (or add missing
                                $P = $cnt;
                                if (!empty($cnt2) && empty($cnt)) $P = $cnt2;
-                               //* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+<BR>";
+                               //* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+<br />";
                                MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
                        }
 
                        // Close sending system
-                       //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($DUMMY)."-<BR>";
+                       //* 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=%d LIMIT 1",
                                 array(bigintval($DATA[0])), __FILE__, __LINE__);
-                               //* DEBUG: */ echo "*L:".__LINE__."*<BR>";
+                               //* DEBUG: */ echo "*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: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                        MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
                                }
                        }
@@ -459,7 +459,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $CONFIG['max_send'])))
                                 array(SELECTION_COUNT($DUMMY), implode(";", $DUMMY), bigintval($DATA[0])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."<PRE>";
                                //* DEBUG: */ print_r($DUMMY);
-                               //* DEBUG: */ echo "</PRE>\n!!!<BR>";
+                               //* DEBUG: */ echo "</PRE>\n!!!<br />";
                                break;
                        }
                }