X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=96355fa9ce87d9db026064103452239b1a84be91;hb=0851db137e420b90617f47b77de2302e770f5f02;hp=7636970fd7924d012a5f2c0f8689934a3dbc8ffe;hpb=0ee18ff2f17d096211666727d9e47f1528a4d885;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 7636970fd7..96355fa9ce 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -231,7 +231,8 @@ function outputAdvancedOverview (&$result_main) {
 		$content['send_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
 	}
 
-	if (isExtensionActive('autopurge')) {
+	// Both extensions must be there
+	if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
 		// Start finding them...
 		$EXCLUDE_LIST = '';
 
@@ -253,9 +254,9 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 WHERE
 	d.`status`='CONFIRMED' AND
-	d.joined < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-	d.last_online < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-	d.ap_notified < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
+	(UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND
+	(UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND
+	(UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?}
 ".$EXCLUDE_LIST."
 ORDER BY
 	d.userid ASC");
@@ -264,13 +265,13 @@ ORDER BY
 		$TITLEs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE--}';
 	}
 
-	if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) {
+	if ((isExtensionInstalledAndNewer('sql_patches', '0.3.4')) && (isExtensionActive('user'))) {
 		// Check for accounts without referal
 		addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
 		$DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
 		$WHATs[]  = 'list_user&amp;mode=norefs';
-	}
+	} // END - if
 
 	if (isExtensionActive('payout')) {
 		// List new payout requests
@@ -316,7 +317,8 @@ ORDER BY
 		$TITLEs[] = '{--ADMIN_TASK_LIST_NOTIFICATIONS_TITLE--}';
 	} // END - if
 
-	if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
+	// Both extensions must be there
+	if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) {
 		// Active rallye
 		if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
 			// Add more bonus points here
@@ -332,11 +334,13 @@ ORDER BY
 			$USE = 'turbo_bonus';
 		}
 
-		// Autopurge installed?
+		// Init variable
 		$lastOnline = '';
-		if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
+
+		// Autopurge installed?
+		if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) {
 			// Use last online timestamp to keep inactive members away from here
-			$lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
+			$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
 		} // END - if
 
 		addSql("SELECT
@@ -355,14 +359,17 @@ ORDER BY
 		$TITLEs[] = '{--ADMIN_TASK_LIST_BONUS_TITLE--}';
 	}
 
-	if (isExtensionInstalledAndNewer('beg', '0.1.2')) {
-		// Begging rallye
+	// Again both extensions must be there
+	if ((isExtensionInstalledAndNewer('beg', '0.1.2')) && (isExtensionActive('user'))) {
+		// ----- Begging rallye -----
 
-		// Autopurge installed?
+		// Init variable
 		$lastOnline = '';
-		if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
+
+		// Autopurge installed?
+		if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) {
 			// Use last online timestamp to keep inactive members away from here
-			$lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
+			$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
 		} // END - if
 
 		addSql("SELECT