X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=426309f2218c912cc890be037842be19cae3dac8;hb=dfaa8c1675da4071ea451406a6f6fedd4c568416;hp=1aced16f60ee5ed4cb060d3ad899bdd6d5992617;hpb=e521a48cf5d2a3090bd8d7a9cb21dfbc2dfda257;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 1aced16f60..426309f221 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -272,19 +272,19 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 
 	if (EXT_IS_ACTIVE("autopurge")) {
 		// Start finding them...
-		$since = (time() - $_CONFIG['ap_inactive_since']);
+		$since = $_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";
-		if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
-		if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
-		if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
+		if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['beg_uid']."";
+		if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['bonus_uid']."";
+		if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['doubler_uid']."";
+		if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
 		// Check for all accounts
 		$SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online
 FROM "._MYSQL_PREFIX."_user_data AS d
-WHERE d.status='CONFIRMED' AND d.joined < ".$since." AND d.last_online < ".$since." AND d.ap_notified < ".$since."
+WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < ".$since." AND d.ap_notified < ".$since."
 ".$EXCLUDE_LIST."
 ORDER BY d.userid";
 		$WHATs[]  = "list_autopurge";
@@ -353,15 +353,14 @@ ORDER BY d.userid";
 		}
 
 		// Autopurge installed?
-		$LAST = ""; $ONLINE = "";
-		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+		$LAST = "";
+		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
 			// Use last online timestamp to keep inactive members away from here
-			$LAST   = " AND last_online >= ";
-			$ONLINE = bigintval(time() - $_CONFIG['ap_inactive_since']);
+			$LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
 		}
 
 		$SQLs[]   = "SELECT ".$USE." AS active_bonus FROM "._MYSQL_PREFIX."_user_data
-WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."".$ONLINE."
+WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."
 ORDER BY active_bonus DESC, userid";
 		$WHATs[]  = "list_bonus";
 		$DESCRs[] = TASK_ADMIN_LIST_BONUS;
@@ -372,15 +371,14 @@ ORDER BY active_bonus DESC, userid";
 		// Begging rallye
 
 		// Autopurge installed?
-		$LAST = ""; $ONLINE = "";
-		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+		$LAST = "";
+		if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
 			// Use last online timestamp to keep inactive members away from here
-			$LAST   = " AND last_online >= ";
-			$ONLINE = bigintval(time() - $_CONFIG['ap_inactive_since']);
+			$LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
 		}
 
 		$SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_data
-WHERE status='CONFIRMED' AND beg_points>0".$LAST."".$ONLINE."
+WHERE status='CONFIRMED' AND beg_points>0".$LAST."
 ORDER BY beg_points DESC, userid";
 		$WHATs[]  = "list_beg";
 		$DESCRs[] = TASK_ADMIN_LIST_BEG;