X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=1528fc2ebeb34eaba5de36e7e25babc3383f80a4;hp=a6ab6e20e7b502939f51bddf4e0349c01943e2bd;hb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;hpb=50b91687d7e7201f6c596a9ad40e8ff35c995074

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index a6ab6e20e7..1528fc2ebe 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,11 +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...
-	$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(getConfig('ap_dm_timeout')), __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;
@@ -65,20 +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",
+			$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) ...;
-				$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(getConfig('ap_dm_timeout')), __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__);
 			}
 		}
 	}
@@ -87,31 +92,37 @@ ORDER BY `sender` ASC",
 	SQL_FREERESULT($result_mails);
 
 	// 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(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
+	$result_mails = SQL_QUERY("SELECT
+	`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",
+			$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",
+				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) ...
-				$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(getConfig('ap_dm_timeout')), __FILE__, __LINE__);
+				$result_mails = SQL_QUERY("SELECT
+	`sender`
+FROM
+	`{?_MYSQL_PREFIX?}_user_stats`
+WHERE
+	`data_type`='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - {?ap_dm_timeout?})
+ORDER BY
+	`sender` ASC", __FILE__, __LINE__);
 			}
 		}
 	}