Heavy rewrite:

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

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 49d13c9a63a3db30c1f0393e54e86ffbd75960f5..9cdfc62706162c13968225acfe1039cb94b8bc24 100644 (file)
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -51,12 +51,11 @@ if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 // Search for mails from deleted members?
 if (getConfig('ap_del_mails') == 'Y') {
        // Okay, let's check for them...
-       $since = getConfig(('ap_dm_timeout'));
-       $result_mails = SQL_QUERY_ESC("SELECT sender
+       $result_mails = SQL_QUERY_ESC("SELECT `sender`
 FROM `{!_MYSQL_PREFIX!}_pool`
-WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-       array($since), __FILE__, __LINE__);
+WHERE data_type='DELETED' AND `timestamp` <= (UNIX_TIMESTAMP() - %s)
+ORDER BY `sender` ASC",
+               array(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
 
        // Reset counter...
        $DELETED = 0;
@@ -66,21 +65,20 @@ ORDER BY sender ASC",
                // Okay, check for their sender's
                while ($content = SQL_FETCHARRAY($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($content['sender'])), __FILE__, __LINE__));
                        if ($found == 0) {
                                // Okay we found some mails!
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s",
-                               array(bigintval($content['sender'])), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE `sender`=%s",
+                                       array(bigintval($content['sender'])), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
-                               // Reset query (to prevent possible errors) ...
-                               $since = getConfig(('ap_dm_timeout'));
-                               $result_mails = SQL_QUERY_ESC("SELECT sender
+                               // Reset query (to prevent possible errors) ...;
+                               $result_mails = SQL_QUERY_ESC("SELECT `sender`
 FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-                               array($since), __FILE__, __LINE__);
+ORDER BY `sender` ASC",
+                                       array(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
                        }
                }
        }
@@ -88,32 +86,32 @@ ORDER BY sender ASC",
        // Free memory
        SQL_FREERESULT($result_mails);
 
-       // Now let's check for stats entries as well
-       $since = getConfig(('ap_dm_timeout'));
-       $result_mails = SQL_QUERY_ESC("SELECT sender
+       // Now let's check for stats entries as well;
+       $result_mails = SQL_QUERY_ESC("SELECT `sender`
 FROM `{!_MYSQL_PREFIX!}_user_stats`
-WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-       array($since), __FILE__, __LINE__);
+WHERE `data_type`='DELETED' AND `timestamp_send` <= (UNIX_TIMESTAMP() - %s)
+ORDER BY `sender` ASC",
+               array(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
 
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's
                while ($content = SQL_FETCHARRAY($result_mails)) {
                        // Check now...
-                       $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($content['sender'])), __FILE__, __LINE__));
+                       $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+                               array(bigintval($content['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($content['sender'])), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `sender`=%s",
+                                       array(bigintval($content['sender'])), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
-                               $since = getConfig(('ap_dm_timeout'));
-                               $result_mails = SQL_QUERY_ESC("SELECT sender
+                               $result_mails = SQL_QUERY_ESC("SELECT `sender`
 FROM `{!_MYSQL_PREFIX!}_user_stats`
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-                               array($since), __FILE__, __LINE__);
+ORDER BY `sender` ASC",
+                                       array(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
                        }
                }
        }
@@ -124,7 +122,7 @@ ORDER BY sender ASC",
        // Do we have deleted mails and the admin want's to receive a notification
        if (($DELETED > 0) && (getConfig('ap_dm_notify') == 'Y')) {
                // Send out email to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), "admin_autopurge_del_mails", $DELETED, '');
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, '');
        } // END - if
 }