X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=671c73589a881d32e01a40f7545a5cdcbeee7e2b;hb=a00ad7dd8c36a5322e28f38d8d641efb90c00c92;hp=9f339426f8a787832a3c4ccc8de1c20687181fa5;hpb=7ed35044deb45bcf59d2432c696129a1651b60cb;p=mailer.git

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 9f339426f8..671c73589a 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,16 +45,15 @@ 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, 2);
+		updateConfiguration('last_monthly', $curr);
 		displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
 	} // 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 +61,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
@@ -75,31 +74,29 @@ if (isBonusRallyeActive()) {
 	} // END - if
 
 	// Check if at least one is in the active rallye
-	$result = SQL_QUERY("SELECT
+	$result = sqlQuery("SELECT
 	`userid`,
 	`email`,
-	`gender`,
-	`surname`,
-	`family`,
-	" . $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,
 	`userid` ASC", __FILE__, __LINE__);
 
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNums($result)) {
 		// List users
 		$OUT   = '';
 		$count = 1;
 		$total = '0';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Add total points
 			$total += $content['points'];
 
@@ -119,7 +116,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
 
@@ -127,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'] = returnErrorMessage('{--ADMIN_BONUS_ALREADY_WITHDRAW--}');
 		}
 
 		// Prepare constant for timemark
@@ -144,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--}');