X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=a6ab6e20e7b502939f51bddf4e0349c01943e2bd;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hp=3970e29008f94b49dac5902c8ae61eb85c04ee82;hpb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;p=mailer.git

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 3970e29008..a6ab6e20e7 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Auto-Loeschung von veralteten Mail-Links         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,25 +38,24 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') != "Y")) {
+if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
 
 // Search for mails from deleted members?
-if (getConfig('ap_del_mails') == "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",
-	 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;
@@ -59,23 +63,22 @@ 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__));
+			$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($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__);
+WHERE `data_type`='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
+ORDER BY `sender` ASC",
+					array(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
 			}
 		}
 	}
@@ -83,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 (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) ...
-				$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__);
+WHERE `data_type`='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
+ORDER BY `sender` ASC",
+					array(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
 			}
 		}
 	}
@@ -117,10 +120,10 @@ ORDER BY sender ASC",
 	SQL_FREERESULT($result_mails);
 
 	// Do we have deleted mails and the admin want's to receive a notification
-	if (($DELETED > 0) && (getConfig('ap_dm_notify') == "Y")) {
+	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, "");
-	}
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, '');
+	} // END - if
 }
 
 //