X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=00fa5ac33bffff4ccc6ac2a900d3e174e5a96491;hb=7ed35044deb45bcf59d2432c696129a1651b60cb;hp=8c8233c23de57fb393bb5ab819dd623041a0b406;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e;p=mailer.git

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 8c8233c23d..00fa5ac33b 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -46,35 +46,32 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bonus')) && (!isAdmin())) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
 	return;
 } // END - if
 
-if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
-	// Add more bonus points here
-	// @TODO Rewrite this to a filter
-	$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`';
-}
+// Add more bonus points here
+$add = runFilterChain('add_bonus_points_user_columns', '');
+$USE = '`turbo_bunus`';
+if (!empty($add)) {
+	$USE = '(0' . $add . ')';
+} // END - if
+
+// Init variables
+$lastOnline = '%s';
+$ONLINE = '';
 
 // 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
 
 // Let's check if there are some points left we can 'pay'...
 $result = SQL_QUERY_ESC("SELECT
-	`userid`, ".$USE." AS points, `last_online`
+	`userid`,
+	".$USE." AS `points`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -83,8 +80,8 @@ WHERE
 	" . $lastOnline . "
 ORDER BY
 	`points` DESC,
-	last_online DESC,
-	userid ASC
+	`last_online` DESC,
+	`userid` ASC
 LIMIT {?bonus_ranks?}",
 	array(
 		$ONLINE
@@ -97,8 +94,8 @@ if (!SQL_HASZERONUMS($result)) {
 	$count = 1;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the template
-		$content['cnt']         = $count;
-		$content['last_online'] = generateDateTime($content['last_online'], 2);
+		$content['count']       = $count;
+		$content['last_online'] = generateDateTime($content['last_online'], '2');
 
 		// Load row template
 		$OUT .= loadTemplate('member_bonus_row', true, $content);