X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=b692cba7b37e98335bcaa8ec909fbd43b67838e5;hb=00283a82c807a00d66bd5811d41992bb3b059996;hp=cf13775287f68a436c826c6684958d0ca03143c5;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index cf13775287..b692cba7b3 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -50,55 +50,59 @@ if (isBonusRallyeActive()) {
 		$curr = getMonth() - 1;
 		if (strlen($curr) == 1) $curr = '0' . $curr;
 		updateConfiguration('last_month', $curr);
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
+		displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
 	} // END - if
 
-	if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
+	// Old version ???
+	$USE = '`turbo_bonus`';
+
+	// Run filter chain to find more columns
+	$add = runFilterChain('add_bonus_points_user_columns', '');
+
+	// Add them, if some where configured
+	if (!empty($add)) {
 		// Add more bonus points here
-		$USE = '(0';
-		if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
-		if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`';
-		if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`';
-		if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`';
-		if (getConfig('bonus_ref_yn')   == 'Y') $USE .= ' + `bonus_ref`';
-		$USE .= ')';
-	} else {
-		// Old version ???
-		$USE = '`turbo_bonus`';
-	}
+		$USE = '(0' . $add . ')';
+	} // END - if
+
+	// 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`,
+	" . $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
-		$OUT = ''; $count = 1; $total = '0';
+		$OUT   = '';
+		$count = 1;
+		$total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Add total points
 			$total += $content['points'];
 
 			// Generate array fore the dynamic template
 			$WIN1 = ''; $WIN2 = '';
-			if ($count <= getConfig('bonus_ranks')) {
+			if ($count <= getBonusRanks()) {
 				// Maybe he can win his active bonus?
 				$WIN1 = '<strong>';
 				$WIN2 = '</strong>';
@@ -107,9 +111,9 @@ ORDER BY
 			// Prepare content
 			$content['email']       = generateEmailLink($content['email'], 'user_data');
 			$content['last_online'] = generateDateTime($content['last_online'], 2);
-			$content['win1']   = $WIN1;
-			$content['win2']   = $WIN2;
-			$content['cnt']    = $count;
+			$content['win1']        = $WIN1;
+			$content['win2']        = $WIN2;
+			$content['count']       = $count;
 
 			// Load template and add it
 			$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
@@ -117,7 +121,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,20 +135,20 @@ 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
 		loadTemplate('admin_list_bonus', false, $content);
 	} else {
 		// No one has become an "activity bonus"...
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
+		displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
 	}
 } else {
 	// Aktive-Rallye not activated
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
+	displayMessage('{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]