Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

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

diff --git a/inc/purge/purge-mails.php b/inc/purge/purge-mails.php
index 61f911bdfaeebb8b3a89ce03ac01d6c55f60ed8b..7e830feb8a6c580faf024913158466a5b8f19175 100644 (file)
--- a/inc/purge/purge-mails.php
+++ b/inc/purge/purge-mails.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -57,10 +57,10 @@ WHERE
 ORDER BY
        `sender` ASC", __FILE__, __LINE__);
 
-// Reset counter...
+// Init counter...
 $deletedStats = '0';
 
-// Do we have "purged" mails?
+// Is there "purged" mails?
 if (!SQL_HASZERONUMS($result_mails)) {
        // Okay, check for their sender's
        while ($content = SQL_FETCHARRAY($result_mails)) {
@@ -72,17 +72,6 @@ if (!SQL_HASZERONUMS($result_mails)) {
 
                        // Get all affected (deleted) rows
                        $deletedStats += SQL_AFFECTEDROWS();
-
-                       // Reset query (to prevent possible errors) ...;
-                       $result_mails = SQL_QUERY("SELECT
-       `sender`
-FROM
-       `{?_MYSQL_PREFIX?}_pool`
-WHERE
-       `data_type`='DELETED' AND
-       (UNIX_TIMESTAMP() - `timestamp`) >= {?ap_dm_timeout?}
-ORDER BY
-       `sender` ASC", __FILE__, __LINE__);
                } // END - if
        } // END - while
 } // END - if
@@ -100,7 +89,7 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-// Do we have "purged" mails?
+// Is there "purged" mails?
 if (!SQL_HASZERONUMS($result_mails)) {
        // Okay, check for their sender's
        while ($content = SQL_FETCHARRAY($result_mails)) {
@@ -129,7 +118,7 @@ ORDER BY
 // Free memory
 SQL_FREERESULT($result_mails);
 
-// Do we have deleted mails and the admin want's to receive a notification
+// Is there deleted mails and the admin want's to receive a notification
 if (($deletedStats > 0) && (getConfig('ap_dm_notify') == 'Y')) {
        // Send out email to admin
        sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats);