X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=ce090689082ce1dbb09c60f06348104488f046e1;hp=8619711604e6cafba1ebd79332a98b1ccc4ff1a8;hb=2b388c21a07e07317ccb065d42ef7304cfca7718;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 8619711604..ce09068908 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mitglieder in Bettel-Rallye auflisten            *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -41,7 +46,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (getConfig('beg_rallye') == "Y") {
 	// Shall I withdraw now?
-	if (isset($_POST['withdraw'])) {
+	if (REQUEST_ISSET_POST(('withdraw'))) {
 		// Okay, let's prepare...
 		$curr = date("m", time()) - 1;
 		if (strlen($curr) == 1) $curr = "0".$curr;
@@ -50,24 +55,24 @@ if (getConfig('beg_rallye') == "Y") {
 	} // END - if
 
 	// Autopurge installed?
-	$LAST = "%s"; $ONLINE = "";
+	$lastOnline = "%s"; $ONLINE = "";
 	if (EXT_IS_ACTIVE("autopurge")) {
 		// Use last online timestamp to keep inactive members away from here
-		$LAST   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+		$lastOnline   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
 		$ONLINE = getConfig('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".$LAST."
+WHERE `status`='CONFIRMED' AND beg_points > 0".$lastOnline."
 ORDER BY beg_points DESC, last_online DESC, userid",
 	 array($ONLINE), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result) > 0) {
 		// List users
 		$OUT = "";$SW = 2; $cnt = 1; $total = 0;
-		while (list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Init variables
 			$WIN1 = ""; $WIN2 = "";
 			if ($cnt <= getConfig('beg_ranks')) {
@@ -77,14 +82,16 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 			} // END - if
 
 			// Prepare content
+			// @TODO Rewrite templates so s/fname will be replaced by surname/family
+			// @TODO to shorten this block. Please also do so with uid->userid
 			$content = array(
-				'uid'    => $uid,
-				'email'  => CREATE_EMAIL_LINK($email, "user_data"),
-				'gender' => TRANSLATE_GENDER($gender),
-				'sname'  => $sname,
-				'fname'  => $fname,
-				'turbo'  => TRANSLATE_COMMA($turbo),
-				'last'   => MAKE_DATETIME($last, "2"),
+				'uid'    => $content['userid'],
+				'email'  => CREATE_EMAIL_LINK($content['email'], "user_data"),
+				'gender' => TRANSLATE_GENDER($content['gender']),
+				'sname'  => $content['surname'],
+				'fname'  => $content['family'],
+				'turbo'  => TRANSLATE_COMMA($content['beg_points']),
+				'last'   => MAKE_DATETIME($content['last_online'], "2"),
 				'sw'     => $SW,
 				'win1'   => $WIN1,
 				'win2'   => $WIN2,
@@ -93,7 +100,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 
 			// Load template and add it
 			$OUT .= LOAD_TEMPLATE("admin_list_beg_rows", true, $content);
-			$SW = 3 - $SW; $cnt++; $total += $turbo;
+			$SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
 		}
 		define('__BEG_ROWS', $OUT);
 		define('__TOTAL', TRANSLATE_COMMA($total));
@@ -104,14 +111,14 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 			define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
 		} else {
 			// Display message "no manual withdraw possible"
-			define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">{!ADMIN_BEG_ALREADY_WITHDRAW!}</div>");
+			define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>");
 		}
 
 		// Prepare constant for timemark
 		if (EXT_IS_ACTIVE("autopurge")) {
 			define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
 		} else {
-			define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+			define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "autopurge"));
 		}
 
 		// Load final template