X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-mails.php;h=7d5de277833197ad8e314faefe9cc544925a7799;hp=99a02c48735f105351c486a719f3646b26515b29;hb=cc7c700143bca2420ff0497e648d31a18cc9add2;hpb=6c763653e88b9d10627e651ca59c7201d4b7d62b

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 99a02c4873..7d5de27783 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -38,17 +38,17 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) {
+if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') != "Y")) {
 	// Abort here
 	return false;
 } // END - if
 
 // Search for mails from deleted members?
-if ($_CONFIG['ap_del_mails'] == "Y") {
+if (getConfig('ap_del_mails') == "Y") {
 	// Okay, let's check for them...
-	$since = bigintval($_CONFIG['ap_dm_timeout']);
+	$since = bigintval(getConfig('ap_dm_timeout'));
 	$result_mails = SQL_QUERY_ESC("SELECT sender\
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
 	 array($since), __FILE__, __LINE__);
@@ -59,20 +59,20 @@ 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 (list($sender) = SQL_FETCHROW($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($sender)), __FILE__, __LINE__));
 			if ($found == 0) {
 				// Okay we found some mails!
-				$result_remove = 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($sender)), __FILE__, __LINE__);
 				$DELETED += SQL_AFFECTEDROWS();
 
 				// Reset query (to prevent possible errors) ...
-				$since = bigintval($_CONFIG['ap_dm_timeout']);
+				$since = bigintval(getConfig('ap_dm_timeout'));
 				$result_mails = SQL_QUERY_ESC("SELECT sender
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
 					array($since), __FILE__, __LINE__);
@@ -84,9 +84,9 @@ ORDER BY sender ASC",
 	SQL_FREERESULT($result_mails);
 
 	// Now let's check for stats entries as well
-	$since = bigintval($_CONFIG['ap_dm_timeout']);
+	$since = bigintval(getConfig('ap_dm_timeout'));
 	$result_mails = SQL_QUERY_ESC("SELECT sender
-FROM "._MYSQL_PREFIX."_user_stats
+FROM `{!_MYSQL_PREFIX!}_user_stats`
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
 		array($since), __FILE__, __LINE__);
@@ -94,18 +94,18 @@ 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 (list($sender) = SQL_FETCHROW($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($sender)), __FILE__, __LINE__));
 			if ($found == 0) {
 				// Okay we found some mails!
-				$result_remove = 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($sender)), __FILE__, __LINE__);
 				$DELETED += SQL_AFFECTEDROWS();
 
 				// Reset query (to prevent possible errors) ...
-				$since = bigintval($_CONFIG['ap_dm_timeout']);
+				$since = bigintval(getConfig('ap_dm_timeout'));
 				$result_mails = SQL_QUERY_ESC("SELECT sender
-FROM "._MYSQL_PREFIX."_user_stats
+FROM `{!_MYSQL_PREFIX!}_user_stats`
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
 					array($since), __FILE__, __LINE__);
@@ -117,7 +117,7 @@ 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) && ($_CONFIG['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, "");
 	}