X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=f2a7020e48cf4084933921673b5e9d3811678f71;hp=d605fc33a99c83386ff1cb87355d6fc63a952e11;hb=c5658999d1970cd4c3c368f4ac7bcba5e5ce52ac;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index d605fc33a9..f2a7020e48 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -54,7 +52,8 @@ $result_mails = SQL_QUERY("SELECT
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
-	`data_type`='DELETED' AND `timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+	`data_type`='DELETED' AND
+	`timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
 ORDER BY
 	`sender` ASC", __FILE__, __LINE__);
 
@@ -62,7 +61,7 @@ ORDER BY
 $deletedStats = '0';
 
 // Do we have "purged" mails?
-if (SQL_NUMROWS($result_mails) > 0) {
+if (!SQL_HASZERONUMS($result_mails)) {
 	// Okay, check for their sender's
 	while ($content = SQL_FETCHARRAY($result_mails)) {
 		// Check now...
@@ -80,7 +79,8 @@ if (SQL_NUMROWS($result_mails) > 0) {
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
-	`data_type`='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+	`data_type`='DELETED' AND
+	`timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
 ORDER BY
 	`sender` ASC", __FILE__, __LINE__);
 		} // END - if
@@ -92,7 +92,7 @@ SQL_FREERESULT($result_mails);
 
 // Now let's check for stats entries as well;
 $result_mails = SQL_QUERY("SELECT
-	`userid` AS sender
+	`userid` AS `sender`
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats`
 WHERE
@@ -101,21 +101,21 @@ ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
 // Do we have "purged" mails?
-if (SQL_NUMROWS($result_mails) > 0) {
+if (!SQL_HASZERONUMS($result_mails)) {
 	// Okay, check for their sender's
 	while ($content = SQL_FETCHARRAY($result_mails)) {
 		// Check now...
 		if (!fetchUserData($content['sender'])) {
 			// Okay we found some mails!
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `userid`=%s",
-				array(bigintval($content['userid'])), __FILE__, __LINE__);
+				array(bigintval($content['sender'])), __FILE__, __LINE__);
 
 			// Get all affected (deleted) rows
 			$deletedStats += SQL_AFFECTEDROWS();
 
 			// Reset query (to prevent possible errors) ...
 			$result_mails = SQL_QUERY("SELECT
-	`userid` AS userid
+	`userid` AS `sender`
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats`
 WHERE
@@ -132,8 +132,8 @@ SQL_FREERESULT($result_mails);
 // Do we have 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_DEL_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats);
+	sendAdminNotification('{--ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT--}', 'admin_autopurge_del_mails', $deletedStats);
 } // END - if
 
-//
+// [EOF]
 ?>