X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=4340ef0a9f175a25ae2459b2aca5766cffd8e0ad;hb=49ffe0a4fb551d0965e97db1ad4ff12f13f4b9ad;hp=013330c1d0cfb24d5a55ce4ef1a3527565899950;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 013330c1d0..4340ef0a9f 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -32,70 +32,64 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if ($CONFIG['beg_rallye'] == "Y")
-{
+if (getConfig('beg_rallye') == "Y") {
 	// Shall I withdraw now?
-	if (isset($_POST['withdraw']))
-	{
+	if (isset($_POST['withdraw'])) {
 		// Okay, let's prepare...
 		$curr = date("m", time()) - 1;
 		if (strlen($curr) == 1) $curr = "0".$curr;
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET beg_month='%s' WHERE config='0' LIMIT 1",
-		 array($curr), __FILE__, __LINE__);
+		UPDATE_CONFIG("last_month", $curr);
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_WITHDRAW_PREPARED);
-		OUTPUT_HTML("<BR>");
-	}
+		OUTPUT_HTML("<br />");
+	} // END - if
 
 	// Autopurge installed?
 	$LAST = "%s"; $ONLINE = "";
-	if (EXT_IS_ACTIVE("autopurge"))
-	{
+	if (EXT_IS_ACTIVE("autopurge")) {
 		// Use last online timestamp to keep inactive members away from here
-		$LAST   = " AND last_online >= %s";
-		$ONLINE = bigintval(time() - $CONFIG['ap_in_since']);
-	}
+		$LAST   = " 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, sex, surname, family, beg_points, last_online
+	$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."
 ORDER BY beg_points DESC, last_online DESC, userid",
 	 array($ONLINE), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0)
-	{
+	if (SQL_NUMROWS($result) > 0) {
 		// List users
 		$OUT = "";$SW = 2; $cnt = 1; $total = 0;
-		while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result))
-		{
-			// Generate array fore the dynamic template
+		while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+			// Init variables
 			$WIN1 = ""; $WIN2 = "";
-			if ($cnt <= $CONFIG['beg_ranks'])
-			{
+			if ($cnt <= getConfig('beg_ranks')) {
 				// Maybe he can win his active beg?
-				$WIN1 = "<STRONG>";
-				$WIN2 = "</STRONG>";
-			}
+				$WIN1 = "<strong>";
+				$WIN2 = "</strong>";
+			} // END - if
+
+			// Prepare content
 			$content = array(
-				'uid'   => $uid,
-				'email' => CREATE_EMAIL_LINK($email, "user_data"),
-				'salut' => TRANSLATE_SEX($sex),
-				'sname' => $sname,
-				'fname' => $fname,
-				'turbo' => TRANSLATE_COMMA($turbo),
-				'last'  => MAKE_DATETIME($last, "2"),
-				'sw'    => $SW,
-				'win1'  => $WIN1,
-				'win2'  => $WIN2,
-				'cnt'   => $cnt,
+				'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"),
+				'sw'     => $SW,
+				'win1'   => $WIN1,
+				'win2'   => $WIN2,
+				'cnt'    => $cnt,
 			);
 
 			// Load template and add it
@@ -106,31 +100,28 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 		define('__TOTAL', TRANSLATE_COMMA($total));
 
 		// Check if we need to display form or not with manuel withdraw
-		if ($CONFIG['beg_month'] == date("m", time()))
-		{
+		if (getConfig('last_month') == date("m", time())) {
 			// Load form
 			define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
-		}
-		 else
-		{
+		} else {
 			// Display message "no manual withdraw possible"
-			define('__BEG_WITHDRAW_FORM', "<FONT class=\"admin_failed\">".ADMIN_BEG_ALREADY_WITHDRAW."</FONT>");
+			define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BEG_ALREADY_WITHDRAW."</div>");
 		}
 
 		// Prepare constant for timemark
-		define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $CONFIG['ap_in_since'], "2"));
+		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"));
+		}
 
 		// Load final template
 		LOAD_TEMPLATE("admin_list_beg");
-	}
-	 else
-	{
+	} else {
 		// No one has joined the begging rallye...
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_NO_RALLYE);
 	}
-}
- else
-{
+} else {
 	// Rallye deactivated
 	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_RALLYE_DEACTIVATED);
 }