X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=225bac8125caab0cb65f2abf39b2f56b2c6853a8;hb=4b9887f734067dc52a1730468e25ba066036a3e1;hp=7bf2f906c7b85ec460f966c8382d8df716c3b74d;hpb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 7bf2f906c7..225bac8125 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -40,19 +40,19 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (getConfig('beg_rallye') == 'Y') {
+if (isBegRallyeEnabled()) {
 	// 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, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_WITHDRAW_PREPARED--}');
 	} // END - if
 
 	// Autopurge installed?
@@ -67,15 +67,17 @@ if (getConfig('beg_rallye') == 'Y') {
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='CONFIRMED' AND beg_points > 0".$lastOnline."
+	`status`='CONFIRMED' AND
+	`beg_points` > 0
+	" . $lastOnline . "
 ORDER BY
 	`beg_points` DESC,
 	`last_online` DESC,
 	`userid` ASC", __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)) {
 			// Init variables
 			$WIN1 = ''; $WIN2 = '';
@@ -94,7 +96,6 @@ ORDER BY
 				'gender'      => $content['gender'],
 				'turbo'       => $content['beg_points'],
 				'last_online' => generateDateTime($content['last_online'], 2),
-				'sw'          => $SW,
 				'win1'        => $WIN1,
 				'win2'        => $WIN2,
 				'cnt'         => $cnt,
@@ -102,14 +103,14 @@ ORDER BY
 
 			// Load template and add it
 			$OUT .= loadTemplate('admin_list_beg_rows', true, $content);
-			$SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
+			$cnt++; $total += $content['beg_points'];
 		} // 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_beg_form', true);
 		} else {
@@ -119,7 +120,7 @@ ORDER BY
 
 		// Prepare constant for timemark
 		if (isExtensionActive('autopurge')) {
-			$content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
+			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
 		} else {
 			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge'));
 		}
@@ -128,11 +129,11 @@ ORDER BY
 		loadTemplate('admin_list_beg', false, $content);
 	} else {
 		// No one has joined the begging rallye...
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_NO_RALLYE--}');
 	}
 } else {
 	// Rallye deactivated
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]