All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

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

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index c523c807ac13aa255efddd5c6e7a5b6c34a8ad54..0adcd3e18726614b0fb2f66d3d89f74b1d50657e 100644 (file)
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -48,7 +48,7 @@ if (getConfig('ap_del_mails') == "Y") {
        // Okay, let's check for them...
        $since = bigintval(getConfig('ap_dm_timeout'));
        $result_mails = SQL_QUERY_ESC("SELECT sender\
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!MYSQL_PREFIX!}_pool`
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
         array($since), __FILE__, __LINE__);
@@ -61,18 +61,18 @@ ORDER BY sender ASC",
                // Okay, check for their sender's
                while(list($sender) = SQL_FETCHROW($result_mails)) {
                        // Check now...
-                       $fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+                       $fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                array(bigintval($sender)), __FILE__, __LINE__));
                        if ($found == 0) {
                                // Okay we found some mails!
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE sender=%s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_pool` WHERE sender=%s",
                                        array(bigintval($sender)), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
                                $since = bigintval(getConfig('ap_dm_timeout'));
                                $result_mails = SQL_QUERY_ESC("SELECT sender
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!MYSQL_PREFIX!}_pool`
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                                        array($since), __FILE__, __LINE__);
@@ -86,7 +86,7 @@ ORDER BY sender ASC",
        // Now let's check for stats entries as well
        $since = bigintval(getConfig('ap_dm_timeout'));
        $result_mails = SQL_QUERY_ESC("SELECT sender
-FROM "._MYSQL_PREFIX."_user_stats
+FROM `{!MYSQL_PREFIX!}_user_stats`
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                array($since), __FILE__, __LINE__);
@@ -96,16 +96,16 @@ ORDER BY sender ASC",
                // Okay, check for their sender's
                while(list($sender) = SQL_FETCHROW($result_mails)) {
                        // Check now...
-                       $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
+                       $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
                        if ($found == 0) {
                                // Okay we found some mails!
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_stats WHERE sender=%s", array(bigintval($sender)), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_stats` WHERE sender=%s", array(bigintval($sender)), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
                                $since = bigintval(getConfig('ap_dm_timeout'));
                                $result_mails = SQL_QUERY_ESC("SELECT sender
-FROM "._MYSQL_PREFIX."_user_stats
+FROM `{!MYSQL_PREFIX!}_user_stats`
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                                        array($since), __FILE__, __LINE__);