X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=65711bcf700fb3a86621091b29dd34e676ed15f1;hp=75e0ecdb482e91172814a8cd3e57a8272c2c4393;hb=1c62a6c2a4ed2bb170e0f1888899625e67a27947;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 75e0ecdb48..65711bcf70 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,39 +38,44 @@
 // 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'))) {
+	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?
-	$lastOnline = "%s"; $ONLINE = '';
+	$lastOnline = '';
 	if (isExtensionActive('autopurge')) {
 		// Use last online timestamp to keep inactive members away from here
-		$lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
-		$ONLINE = getConfig('ap_inactive_since');
+		$lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
 	} // END - if
 
 	// Check if at least one is in the active rallye
-	$result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE `status`='CONFIRMED' AND beg_points > 0".$lastOnline."
-ORDER BY beg_points DESC, last_online DESC, userid",
-	array($ONLINE), __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT `userid`, `gender`, `surname`, `family`, `email`, `beg_points`, `last_online`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data`
+WHERE
+	`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 = '';
@@ -88,12 +91,9 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 			$content = array(
 				'userid'      => $content['userid'],
 				'email'       => generateEmailLink($content['email'], 'user_data'),
-				'gender'      => translateGender($content['gender']),
-				'surname'     => $content['surname'],
-				'family'      => $content['family'],
-				'turbo'       => translateComma($content['beg_points']),
+				'gender'      => $content['gender'],
+				'turbo'       => $content['beg_points'],
 				'last_online' => generateDateTime($content['last_online'], 2),
-				'sw'          => $SW,
 				'win1'        => $WIN1,
 				'win2'        => $WIN2,
 				'cnt'         => $cnt,
@@ -101,37 +101,37 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 
 			// 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);
+		$content['total'] = $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 {
 			// Display message "no manual withdraw possible"
-			$content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '<div class="admin_failed">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>');
+			$content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '{--ADMIN_BEG_ALREADY_WITHDRAW--}');
 		}
 
 		// 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_NOT_INSTALLED', 'autopurge'));
+			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, generateExtensionInactiveNotInstalledMessage('autopurge'));
 		}
 
 		// Load final template
 		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]