X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=d3b45396ac5fc56d4a4d1a718c48a1f9e7f685e5;hp=a2d500a129cfb1d8f052d811b7f85e6b87ba7e94;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index a2d500a129..d3b45396ac 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -45,11 +45,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (getConfig('bonus_active') == 'Y') {
+if (ifBonusRallyeActive()) {
 	// Shall I withdraw now?
 	if (isPostRequestParameterSet('withdraw')) {
 		// Okay, let's prepare...
-		$curr = date('m', time()) - 1;
+		$curr = getMonth() - 1;
 		if (strlen($curr) == 1) $curr = '0' . $curr;
 		updateConfiguration('last_month', $curr);
 		loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
@@ -91,9 +91,9 @@ ORDER BY
 	`userid` ASC",
 		array($ONLINE), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List users
-		$OUT = '';$SW = 2; $cnt = 1; $total = '0';
+		$OUT = ''; $cnt = 1; $total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Add total points
 			$total += $content['points'];
@@ -109,21 +109,20 @@ ORDER BY
 			// Prepare content
 			$content['email']       = generateEmailLink($content['email'], 'user_data');
 			$content['last_online'] = generateDateTime($content['last_online'], 2);
-			$content['sw']     = $SW;
 			$content['win1']   = $WIN1;
 			$content['win2']   = $WIN2;
 			$content['cnt']    = $cnt;
 
 			// Load template and add it
 			$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
-			$SW = 3 - $SW; $cnt++;
+			$cnt++;
 		} // END - while
 
 		$content['rows']  = $OUT;
 		$content['total'] = translateComma($total);
 
 		// Check if we need to display form or not with manuel withdraw
-		if (getConfig('last_month') == date('m', time())) {
+		if (getConfig('last_month') == getMonth()) {
 			// Load form
 			$content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true);
 		} else {
@@ -134,7 +133,7 @@ ORDER BY
 		// Prepare constant for timemark
 		// @TODO Can't this be moved into our expression language?
 		if (isExtensionActive('autopurge')) {
-			$content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
+			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
 		} else {
 			$content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge');
 		}