Fixes for sending pool

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

diff --git a/inc/pool-update.php b/inc/pool-update.php
index 58a1bb91cd46172246c8e64a3708bde6103a49e0..509e04b75461a3cbf8ac9de61426bbc8cf865d36 100644 (file)
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -62,14 +62,14 @@ if (SQL_NUMROWS($result_main) > 0)
        while ($DATA = SQL_FETCHROW($result_main))
        {
                // Check fetched data for HTML
-               $HTML = $DATA[10]; if ($HTML == $DATA['id']) $HTML = "N";
+               $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = "N";
 
                // Compile URL and subject line
                $DATA[7] = COMPILE_CODE($DATA[7]);
 
                // Set mail order as "active". That means it will be sent out
                $result_active = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1",
-                array($DATA['id']), __FILE__, __LINE__);
+                array($DATA[0]), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1)
                {
                        // "Explode" all receivers into an array
@@ -110,7 +110,7 @@ if (SQL_NUMROWS($result_main) > 0)
 
                                        // Do we have a stats entry?
                                        $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
-                                        array($DATA['id'], $DATA[1], $DATA[6]), __FILE__, __LINE__);
+                                        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 />";
@@ -118,11 +118,11 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                // No entry was found, so we add him!
                                                $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' , UNIX_TIMESTAMP())",
-                                                array(bigintval($DATA['id']), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
+                                                array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
 
                                                // Receive it's ID for the links table
                                                $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
-                                                array(bigintval($DATA['id']), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
+                                                array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
                                        }
 
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
@@ -133,8 +133,8 @@ 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['id']."/".$stats_id."?<br />";
-                                               switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA['id']), bigintval($stats_id)))
+                                               //* 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":
                                                        // Prepare the mail
@@ -151,7 +151,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                        // Prepare content
                                                        $content = array(
                                                                'id'         => $DATA[11],
-                                                               'url'        => $DATA[3],
+                                                               'url'        => $DATA[7],
                                                                'sender_uid' => $DATA[1],
                                                                'category'   => GET_CATEGORY($DATA[9]),
                                                                'time'       => CREATE_FANCY_TIME(GET_PAY_POINTS($DATA[5], "time")),
@@ -196,12 +196,15 @@ if (SQL_NUMROWS($result_main) > 0)
                                        }
 
                                        // 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['id']."*<br />";
-                                       if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA['id'])) {
+                                       //* 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])) {
                                                // Prepare content
                                                $content = array(
                                                        'sender_uid' => $DATA[1],
-                                                       'category'   => GET_CATEGORY($DATA[9])
+                                                       'category'   => GET_CATEGORY($DATA[9]),
+                                                       'text'       => $DATA[3],
+                                                       'url'        => $DATA[7],
+                                                       'expiration' => CREATE_FANCY_TIME(GET_PAY_POINTS($DATA[5], "time"))
                                                );
 
                                                // Yes we do, so we notify admin and sender about fully sent mail!
@@ -224,13 +227,13 @@ if (SQL_NUMROWS($result_main) > 0)
 
                                                // Set status to SEND because we completely send it away
                                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
-                                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
+                                                array(bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                // Update send-completed-time
                                                $result_user = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_stats SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1",
-                                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
+                                                array(bigintval($DATA[0])), __FILE__, __LINE__);
 
-                                               $LAST_SENT_ID = $DATA['id']; $cnt = 0;
+                                               $LAST_SENT_ID = $DATA[0]; $cnt = 0;
                                                $cnt2 += $cnt;
 
                                                // Update mediadata if version is 0.0.4 or higher
@@ -251,7 +254,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                $ADD = "";
                                                if ($cnt <= $DATA[8]) $ADD = ", target_send=target_send-".$cnt;
                                                $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%s LIMIT 1",
-                                                array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
+                                                array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
                                                break;
@@ -264,7 +267,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                // List was empty
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND' WHERE id=%s LIMIT 1",
-                                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
+                                                array(bigintval($DATA[0])), __FILE__, __LINE__);
                                        }
                                         else
                                        {
@@ -293,7 +296,7 @@ if (SQL_NUMROWS($result_main) > 0)
 
                                        // Update receivers
                                        $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET receivers='%s' WHERE id=%s LIMIT 1",
-                                        array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
+                                        array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
                                }
                        }
                }