Another column fix

[mailer.git] / inc / modules / admin / what-list_beg.php

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 8453ffe978ff0c1bb2bc45823fc1764e96a634e0..cc3eba1700290d80e7f6a5bac12a76faf0f20309 100644 (file)
--- 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__));
 
-if ($CONFIG['beg_rallye'] == 'Y')
+if ($_CONFIG['beg_rallye'] == "Y")
 {
        // Shall I withdraw now?
        if (isset($_POST['withdraw']))
@@ -48,10 +47,9 @@ 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>");
+               OUTPUT_HTML("<br />");
        }
 
        // Autopurge installed?
@@ -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,28 +72,28 @@ 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 = "";
-                       if ($cnt <= $CONFIG['beg_ranks'])
+                       if ($cnt <= $_CONFIG['beg_ranks'])
                        {
                                // Maybe he can win his active beg?
                                $WIN1 = "<STRONG>";
                                $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");