X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=225bac8125caab0cb65f2abf39b2f56b2c6853a8;hb=98b92ea5ba992a63304091fa1b57f477befffc22;hp=fa28e4411d601cd7d321e3a33d49b90082849db3;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index fa28e4411d..225bac8125 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/22/2005 *
- * ================                             Last change: 10/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 10/22/2005 *
+ * ===================                          Last change: 10/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_beg.php                                *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,98 +40,100 @@
 // 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 (isPostRequestElementSet(('withdraw'))) {
+	if (isPostRequestParameterSet('withdraw')) {
 		// Okay, let's prepare...
-		$curr = date('m', time()) - 1;
-		if (strlen($curr) == 1) $curr = '0'.$curr;
+		$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 = '';
+
+			// Maybe he can win his active beg?
 			if ($cnt <= getConfig('beg_ranks')) {
-				// Maybe he can win his active beg?
-				$WIN1 = "<strong>";
-				$WIN2 = "</strong>";
+				// Mark him
+				$WIN1 = '<strong>';
+				$WIN2 = '</strong>';
 			} // END - if
 
 			// Prepare content
-			// @TODO Rewrite templates so s/family will be replaced by surname/family
-			// @TODO to shorten this block. Please also do so with userid->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']),
-				'last_online'   => generateDateTime($content['last_online'], '2'),
-				'sw'     => $SW,
-				'win1'   => $WIN1,
-				'win2'   => $WIN2,
-				'cnt'    => $cnt,
+				'userid'      => $content['userid'],
+				'email'       => generateEmailLink($content['email'], 'user_data'),
+				'gender'      => $content['gender'],
+				'turbo'       => $content['beg_points'],
+				'last_online' => generateDateTime($content['last_online'], 2),
+				'win1'        => $WIN1,
+				'win2'        => $WIN2,
+				'cnt'         => $cnt,
 			);
 
 			// 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 {
 			// 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, '<div class="admin_failed">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>');
 		}
 
 		// 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, sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
+			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', '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]