X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=7b02b64a92348de6184214e81487d95ff74ce458;hp=721ee92dd8763c8c5f53e25f11f8e59ea30068cd;hb=e521a48cf5d2a3090bd8d7a9cb21dfbc2dfda257;hpb=307a4e11763f0914e73dc756b219356e1c29ab25

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 721ee92dd8..7b02b64a92 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -32,30 +32,26 @@
  ************************************************************************/
 
 // 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__));
 
-if ($_CONFIG['bonus_active'] == "Y")
-{
+if ($_CONFIG['bonus_active'] == "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 last_bonus_month='%s' WHERE config=0 LIMIT 1",
-		 array($curr), __FILE__, __LINE__);
+		UPDATE_CONFIG("last_month", $curr);
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
 		OUTPUT_HTML("<br />");
 	}
 
-	if (GET_EXT_VERSION("bonus") >= "0.6.9")
-	{
+	if (GET_EXT_VERSION("bonus") >= "0.6.9") {
 		// Add more bonus points here
 		$USE = "(0";
 		if ($_CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
@@ -64,55 +60,51 @@ if ($_CONFIG['bonus_active'] == "Y")
 		if ($_CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
 		if ($_CONFIG['bonus_ref_yn']   == "Y") $USE .= " + bonus_ref";
 		$USE .= ")";
-	}
-	 else
-	{
+	} else {
 		// Old version ???
 		$USE = "turbo_bonus";
 	}
 
 	// 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']);
+		$ONLINE = bigintval(time() - $_CONFIG['ap_inactive_since']);
 	}
 
 	// Check if at least one is in the active rallye
-	$result = SQL_QUERY_ESC("SELECT userid, email, sex, surname, family, ".$USE." AS active_bonus, last_online
+	$result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS active_bonus, last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY active_bonus 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))
-		{
+		while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
 			// Generate array fore the dynamic template
 			$WIN1 = ""; $WIN2 = "";
-			if ($cnt <= $_CONFIG['bonus_ranks'])
-			{
+			if ($cnt <= $_CONFIG['bonus_ranks']) {
 				// Maybe he can win his active bonus?
 				$WIN1 = "<STRONG>";
 				$WIN2 = "</STRONG>";
 			}
+
+			// 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
@@ -123,7 +115,7 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
 		define('__TOTAL', TRANSLATE_COMMA($total));
 
 		// Check if we need to display form or not with manuel withdraw
-		if ($_CONFIG['bonus_month'] == date("m", time()))
+		if ($_CONFIG['last_month'] == date("m", time()))
 		{
 			// Load form
 			define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
@@ -135,7 +127,7 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
 		}
 
 		// Prepare constant for timemark
-		define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_in_since'], "2"));
+		define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_inactive_since'], "2"));
 
 		// Load final template
 		LOAD_TEMPLATE("admin_list_bonus");