Previous fix fixed, a lot constants rewritten (unfinished)

[mailer.git] / inc / autopurge / purge-general.php

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index 8e8f722ffcdc512b98288ba3763d7fa22c45ebb2..a11fc14b333f8b9a65dbe635420900081dd6eaf6 100644 (file)
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -53,17 +53,17 @@ if ((getConfig('auto_purge_active') == "Y") && (getConfig('auto_purge') > 0)) {
 
        // Then check for outdated mail order. We don't delete them just the confirmation links will be deleted.
        $result = SQL_QUERY_ESC("SELECT s.id, s.userid, s.pool_id, t.price
-FROM `{!MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!MYSQL_PREFIX!}_payments` AS t
+FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS t
 ON s.payment_id=t.id
 WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
         array(bigintval($PURGE)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start deleting procedure
                $uid = 0; $points = 0;
-               while(list($mid, $sender, $pool, $price) = SQL_FETCHROW($result)) {
+               while (list($mid, $sender, $pool, $price) = SQL_FETCHROW($result)) {
                        // Check if confirmation links are purged or not
-                       $result_links = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s LIMIT 1",
+                       $result_links = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s LIMIT 1",
                         array(bigintval($mid)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_links) == 1) {
                                // Free memory
@@ -80,11 +80,11 @@ WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
                                $uid = $sender; $points += $price; $admin_points += $price;
 
                                // Remove confirmation links from queue
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",
                                        array(bigintval($mid)), __FILE__, __LINE__);
 
                                // Update status of order
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='DELETED' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='DELETED' WHERE id=%s LIMIT 1",
                                        array(bigintval($pool)), __FILE__, __LINE__);
                        } // END - if
                } // END - while
@@ -99,14 +99,14 @@ WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
        // Is the 'bonus' extension installed and activated?
        if (EXT_IS_ACTIVE("bonus", true)) {
                // Check for bonus campaigns
-               $result = SQL_QUERY_ESC("SELECT id, points FROM `{!MYSQL_PREFIX!}_bonus` WHERE data_type='SEND' AND timestamp <= %s ORDER BY id",
+               $result = SQL_QUERY_ESC("SELECT id, points FROM `{!_MYSQL_PREFIX!}_bonus` WHERE data_type='SEND' AND timestamp <= %s ORDER BY `id`",
                        array(bigintval($PURGE)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) > 0) {
                        // Start deleting procedure
                        $points = 0;
                        while (list($bid, $price) = SQL_FETCHROW($result)) {
                                // Check if confirmation links are purged or not
-                               $result_links = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+                               $result_links = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
                                        array(bigintval($bid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result_links) > 0) {
                                        // At least one link was found, enougth to pay back the points
@@ -116,11 +116,11 @@ WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
                                        SQL_FREERESULT($result_links);
 
                                        // Remove confirmation links from queue
-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
                                                array(bigintval($bid)), __FILE__, __LINE__);
 
                                        // Update status of order
-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_bonus` SET data_type='DELETED' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='DELETED' WHERE id=%s LIMIT 1",
                                                array(bigintval($bid)), __FILE__, __LINE__);
                                } // END - if
                        } // END - while