X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=70c57a3a5ee013a6ef08964847ce81a6dfce0e66;hb=3c50057c4da8c632d1923d7879a2b870d1eb7155;hp=e876b7a1fc0f79c70d7ae9c346e78cb590d977a0;hpb=4a0e224c4e1754dbc2151fd707a926521dbafa7f;p=mailer.git

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index e876b7a1fc..70c57a3a5e 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 - 2012 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 *
@@ -54,7 +54,7 @@ if (isBonusRallyeActive()) {
 	} // END - if
 
 	// Old version ???
-	$USE = '`turbo_bonus`';
+	$pointsColumns = '`turbo_bonus`';
 
 	// Run filter chain to find more columns
 	$add = runFilterChain('add_bonus_points_user_columns', '');
@@ -62,7 +62,7 @@ if (isBonusRallyeActive()) {
 	// Add them, if some where configured
 	if (!empty($add)) {
 		// Add more bonus points here
-		$USE = '(0' . $add . ')';
+		$pointsColumns = '(0' . $add . ')';
 	} // END - if
 
 	// Init variables
@@ -78,14 +78,15 @@ if (isBonusRallyeActive()) {
 	$result = SQL_QUERY("SELECT
 	`userid`,
 	`email`,
-	" . $USE . " AS `points`,
+	" . $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,
@@ -116,7 +117,7 @@ ORDER BY
 			$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
 
@@ -126,10 +127,10 @@ ORDER BY
 		// Check if we need to display form or not with manuel withdraw
 		if (getLastMonth() == 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'] = loadTemplate('admin_settings_unsaved', TRUE, '{--ADMIN_BONUS_ALREADY_WITHDRAW--}');
 		}
 
 		// Prepare constant for timemark
@@ -141,7 +142,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--}');