X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=5741d36d2032c81a316543534454de481347a98d;hb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;hp=61d2f2babc2471a4adf7361de565a58923b8871e;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 61d2f2babc..5741d36d20 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,12 +38,11 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
+if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
 	// Abort here
 	return false;
 } // END - if
@@ -51,12 +50,14 @@ if ((!EXT_IS_ACTIVE('autopurge')) || (getConfig('auto_purge_active') != "Y")) {
 // Search for mails from deleted members?
 if (getConfig('ap_del_mails') == 'Y') {
 	// Okay, let's check for them...
-	$since = getConfig(('ap_dm_timeout'));
-	$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__);
+	$result_mails = SQL_QUERY("SELECT
+	`sender`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`data_type`='DELETED' AND `timestamp` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ORDER BY
+	`sender` ASC", __FILE__, __LINE__);
 
 	// Reset counter...
 	$DELETED = 0;
@@ -66,21 +67,23 @@ ORDER BY sender ASC",
 		// Okay, check for their sender's
 		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($content['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",
+				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
-FROM `{!_MYSQL_PREFIX!}_pool`
-WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-					array($since), __FILE__, __LINE__);
+				// Reset query (to prevent possible errors) ...;
+				$result_mails = SQL_QUERY("SELECT
+	`sender`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`data_type`='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ORDER BY
+	`sender` ASC", __FILE__, __LINE__);
 			}
 		}
 	}
@@ -88,32 +91,38 @@ 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
-FROM `{!_MYSQL_PREFIX!}_user_stats`
-WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-		array($since), __FILE__, __LINE__);
+	// Now let's check for stats entries as well;
+	$result_mails = SQL_QUERY("SELECT
+	`userid` AS sender
+FROM
+	`{?_MYSQL_PREFIX?}_user_stats`
+WHERE
+	`data_type`='DELETED' AND `timestamp_send` <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ORDER BY
+	`sender` ASC", __FILE__, __LINE__);
 
 	// Do we have "purged" mails?
 	if (SQL_NUMROWS($result_mails) > 0) {
 		// Okay, check for their sender's
 		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($content['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($content['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
-FROM `{!_MYSQL_PREFIX!}_user_stats`
-WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
-ORDER BY sender ASC",
-					array($since), __FILE__, __LINE__);
+				$result_mails = SQL_QUERY("SELECT
+	`userid` AS sender
+FROM
+	`{?_MYSQL_PREFIX?}_user_stats`
+WHERE
+	`data_type`='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ORDER BY
+	`sender` ASC", __FILE__, __LINE__);
 			}
 		}
 	}
@@ -124,7 +133,7 @@ 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(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), "admin_autopurge_del_mails", $DELETED, '');
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DEL_MAILS_SUBJECT'), 'admin_autopurge_del_mails', $DELETED, '');
 	} // END - if
 }