X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fautopurge%2Fpurge-inact.php;h=b1d5bc92f8015bcb87cdc279fcc5197f71ab9fc4;hb=2ec83ffdf7e326eb5ff5d9f1c7f4eb2fbc75e57c;hp=053148b5e5cee9ccc1353824f3fc4a2a1b4a93c1;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 053148b5e5..b1d5bc92f8 100644
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -44,10 +44,10 @@ if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) {
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
-if ($_CONFIG['ap_inactive'] == "Y") {
+if ($_CONFIG['autopurge_inactive'] == "Y") {
 	// Ok, let's have a look...
-	$since = bigintval($_CONFIG['ap_in_since']);
-	$EXCLUDE_LIST = " AND d.userid != c.def_refid";
+	$since = bigintval($_CONFIG['ap_inactive_since']);
+	$EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'];
 
 	// Check for more extensions
 	if (EXT_IS_ACTIVE("beg"))     $EXCLUDE_LIST .= " AND d.userid != c.beg_uid";
@@ -57,12 +57,12 @@ if ($_CONFIG['ap_inactive'] == "Y") {
 	// Check for new holiday extension
 	if (GET_EXT_VERSION("holiday") >= "0.1.3") {
 		// Include only users with no active holiday
-		$EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
+		$EXCLUDE_LIST .= " AND d.holiday_active='N'";
 	} // END - if
 
 	// Check for all accounts
 	$result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online
-FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c
+FROM "._MYSQL_PREFIX."_user_data AS d
 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
@@ -70,7 +70,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_inactive) > 0) {
 		// Prepare variables and constants...
 		$UIDs = "";
-		define('__INACTIVE_SINCE', ($_CONFIG['ap_in_since'] / 60 / 60));
+		define('__INACTIVE_SINCE', ($_CONFIG['ap_inactive_since'] / 60 / 60));
 		define('__INACTIVE_TIME' , ($_CONFIG['ap_in_time']  / 60 / 60));
 
 		// Mark found accounts as inactive and send an email
@@ -104,7 +104,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 	// here for e.g. excluding holiday users
 	$time = bigintval($_CONFIG['ap_in_time']);
 	$result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
-FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c
+FROM "._MYSQL_PREFIX."_user_data AS d
 WHERE status='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY userid",