X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=795e2d1fb7495a91dae8c34239f20458c97897c3;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=d605fc33a99c83386ff1cb87355d6fc63a952e11;hpb=da475800e7c8dba5434f2baddadae8d65a7dff2f;p=mailer.git

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index d605fc33a9..795e2d1fb7 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
@@ -101,7 +101,7 @@ 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...
@@ -115,7 +115,7 @@ if (SQL_NUMROWS($result_mails) > 0) {
 
 			// Reset query (to prevent possible errors) ...
 			$result_mails = SQL_QUERY("SELECT
-	`userid` AS userid
+	`userid`
 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]
 ?>