X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=ccc9fbd0a90b07dabfaffd346b6766a953cf88bc;hb=e46c5fea5c110ad9bb1514d2c92a60b140f28f70;hp=21c07396ff0fbf373fc7ad7fe2dd828463f8d3c8;hpb=c6017cf76200e2a5e68bd1984fa2d31f0e3be9d8;p=mailer.git

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 21c07396ff..ccc9fbd0a9 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -50,20 +50,12 @@ if ((!isExtensionActive('bonus')) && (!isAdmin())) {
 	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';
@@ -72,12 +64,14 @@ $ONLINE = '';
 // Autopurge installed?
 if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
 	// Use last online timestamp to keep inactive members away from here
-	$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?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
@@ -86,8 +80,8 @@ WHERE
 	" . $lastOnline . "
 ORDER BY
 	`points` DESC,
-	last_online DESC,
-	userid ASC
+	`last_online` DESC,
+	`userid` ASC
 LIMIT {?bonus_ranks?}",
 	array(
 		$ONLINE
@@ -100,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);