A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 3970e29008f94b49dac5902c8ae61eb85c04ee82..55979178ec69f50dbda64dd62b5132436a8e312e 100644 (file)
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -47,7 +47,7 @@ if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') != "Y")) {
 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",
@@ -59,14 +59,14 @@ ORDER BY sender ASC",
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's
-               while (list($sender) = SQL_FETCHROW($result_mails)) {
+               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",
-                               array(bigintval($sender)), __FILE__, __LINE__));
+                               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($sender)), __FILE__, __LINE__);
+                                       array(bigintval($content['sender'])), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
@@ -94,12 +94,12 @@ ORDER BY sender ASC",
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's
-               while (list($sender) = SQL_FETCHROW($result_mails)) {
+               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($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($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) ...
@@ -119,8 +119,8 @@ 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
-               SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT, "admin_autopurge_del_mails", $DELETED, "");
-       }
+               SEND_ADMIN_NOTIFICATION(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), "admin_autopurge_del_mails", $DELETED, "");
+       } // END - if
 }
 
 //