X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fautopurge%2Fpurge-mails.php;h=7d5de277833197ad8e314faefe9cc544925a7799;hb=cc7c700143bca2420ff0497e648d31a18cc9add2;hp=89f4dd7d632175357da2a62c1368191fb12da49f;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;p=mailer.git

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 89f4dd7d63..7d5de27783 100644
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') == "N")) {
+if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') != "Y")) {
 	// Abort here
 	return false;
 } // END - if
@@ -48,7 +48,7 @@ if (getConfig('ap_del_mails') == "Y") {
 	// Okay, let's check for them...
 	$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(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__);
@@ -86,7 +86,7 @@ ORDER BY sender ASC",
 	// Now let's check for stats entries as well
 	$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(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__);