X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=5fb3f71b9f6e6a1a7e84493773b77fe4afb6da21;hb=bb26a0d30f5069bb00c65ac715cbf04b2ae672d9;hp=cbb750f414a451cf5a26c15768292b5b30a4ca56;hpb=c3e061c0d6fc0ee8778ebaebf1c05cf2bf126703;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index cbb750f414..5fb3f71b9f 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -32,15 +32,14 @@
  ************************************************************************/
 
 // 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 ($_CONFIG['beg_rallye'] == "Y")
 {
 	// Shall I withdraw now?
 	if (isset($_POST['withdraw']))
@@ -48,8 +47,7 @@ if ($_CONFIG['beg_rallye'] == 'Y')
 		// 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 />");
 	}
@@ -59,12 +57,12 @@ if ($_CONFIG['beg_rallye'] == 'Y')
 	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 = $_CONFIG['ap_inactive_since'];
 	}
 
 	// 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",
@@ -74,7 +72,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 	{
 		// List users
 		$OUT = "";$SW = 2; $cnt = 1; $total = 0;
-		while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result))
+		while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result))
 		{
 			// Generate array fore the dynamic template
 			$WIN1 = ""; $WIN2 = "";
@@ -85,17 +83,17 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 				$WIN2 = "</STRONG>";
 			}
 			$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,7 +104,7 @@ 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 ($_CONFIG['last_month'] == date("m", time()))
 		{
 			// Load form
 			define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
@@ -118,7 +116,11 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 		}
 
 		// 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() - $_CONFIG['ap_inactive_since'], "2"));
+		} else {
+			define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+		}
 
 		// Load final template
 		LOAD_TEMPLATE("admin_list_beg");