X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=f4e2160330f176d4449bf7a537accc009f009ce1;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hp=ab6f753a30538dc3055a6088c942bbe3e5b2188c;hpb=17c1d13dde4b9725bb9dc55c49838ff9aa751dc0;p=mailer.git

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index ab6f753a30..f4e2160330 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * 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 *
@@ -45,27 +45,24 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isBonusRallyeActive()) {
 	// Shall I withdraw now?
-	if (isPostRequestParameterSet('withdraw')) {
+	if (isPostRequestElementSet('withdraw')) {
 		// Okay, let's prepare...
-		$curr = getMonth() - 1;
-		if (strlen($curr) == 1) $curr = '0' . $curr;
-		updateConfiguration('last_month', $curr);
+		$curr = padLeftZero(getMonth() - 1);
+		updateConfiguration('last_monthly', $curr);
 		displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
 	} // END - if
 
-	if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
+	// Old version ???
+	$pointsColumns = '`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`';
-	}
+		$pointsColumns = '(0' . $add . ')';
+	} // END - if
 
 	// Init variables
 	$lastOnline = '';
@@ -73,18 +70,22 @@ if (isBonusRallyeActive()) {
 	// 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
 
 	// Check if at least one is in the active rallye
 	$result = SQL_QUERY("SELECT
-	`userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS `points`, `last_online`
+	`userid`,
+	`email`,
+	" . $pointsColumns . " AS `points`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`status`='CONFIRMED' AND
-	" . $USE . " > 0
+	" . $pointsColumns . " > 0
 	" . $lastOnline . "
+	" . runFilterChain('user_exclusion_sql', ' ') . "
 ORDER BY
 	`points` DESC,
 	`last_online` DESC,
@@ -92,14 +93,16 @@ ORDER BY
 
 	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>';
@@ -108,12 +111,12 @@ 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['count']  = $count;
+			$content['win1']        = $WIN1;
+			$content['win2']        = $WIN2;
+			$content['count']       = $count;
 
 			// Load template and add it
-			$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
+			$OUT .= loadTemplate('admin_list_bonus_rows', TRUE, $content);
 			$count++;
 		} // END - while
 
@@ -121,12 +124,12 @@ ORDER BY
 		$content['total_points'] = $total;
 
 		// Check if we need to display form or not with manuel withdraw
-		if (getLastMonth() == getMonth()) {
+		if (getLastMonthly() == getMonth()) {
 			// Load form
-			$content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true);
+			$content['withdraw_form'] = loadTemplate('admin_list_bonus_form', TRUE);
 		} else {
 			// Display message "no manual withdraw possible"
-			$content['withdraw_form'] = loadTemplate('admin_settings_unsaved', true, '{--ADMIN_BONUS_ALREADY_WITHDRAW--}');
+			$content['withdraw_form'] = displayErrorMessage('{--ADMIN_BONUS_ALREADY_WITHDRAW--}', TRUE);
 		}
 
 		// Prepare constant for timemark
@@ -138,7 +141,7 @@ ORDER BY
 		}
 
 		// Load final template
-		loadTemplate('admin_list_bonus', false, $content);
+		loadTemplate('admin_list_bonus', FALSE, $content);
 	} else {
 		// No one has become an "activity bonus"...
 		displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');