X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=2dace09bf4e719390edaa52a6ab4990b428b3876;hb=cc59ea1cce3e0fafc2cc6c9e36142698cf2b58ef;hp=0667f2b89cb4a0df68c476d91a4cbc771f5ffd3c;hpb=4c221b6350439b8f91db58f142f03f79014f2eaf;p=mailer.git

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 0667f2b89c..2dace09bf4 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -67,27 +67,28 @@ if (isBonusRallyeActive()) {
 		$USE = '`turbo_bonus`';
 	}
 
+	// Init variables
+	$lastOnline = '';
+
 	// Autopurge installed?
-	$lastOnline = '%s'; $ONLINE = '';
-	if (isExtensionActive('autopurge')) {
+	if ((isExtensionActive('autopurge')) && ((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
 
 	// Check if at least one is in the active rallye
-	$result = SQL_QUERY_ESC("SELECT
-	`userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online`
+	$result = SQL_QUERY("SELECT
+	`userid`, `email`, `gender`, `surname`, `family`, " . $USE . " AS `points`, `last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`status`='CONFIRMED' AND
-	".$USE." > 0
-	".$lastOnline."
+	" . $USE . " > 0
+	" . $lastOnline . "
 ORDER BY
 	`points` DESC,
 	`last_online` DESC,
-	`userid` ASC",
-		array($ONLINE), __FILE__, __LINE__);
+	`userid` ASC", __FILE__, __LINE__);
 
 	if (!SQL_HASZERONUMS($result)) {
 		// List users
@@ -109,7 +110,7 @@ ORDER BY
 			$content['last_online'] = generateDateTime($content['last_online'], 2);
 			$content['win1']   = $WIN1;
 			$content['win2']   = $WIN2;
-			$content['cnt']    = $count;
+			$content['count']  = $count;
 
 			// Load template and add it
 			$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
@@ -117,7 +118,7 @@ ORDER BY
 		} // END - while
 
 		$content['rows']  = $OUT;
-		$content['total'] = $total;
+		$content['total_points'] = $total;
 
 		// Check if we need to display form or not with manuel withdraw
 		if (getLastMonth() == getMonth()) {
@@ -131,9 +132,9 @@ ORDER BY
 		// Prepare constant for timemark
 		// @TODO Can't this be moved into our expression language?
 		if (isExtensionActive('autopurge')) {
-			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
+			$content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
 		} else {
-			$content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
+			$content['autopurge_timeout'] = '{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}';
 		}
 
 		// Load final template