Queries improved

[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 cbb750f414a451cf5a26c15768292b5b30a4ca56..3fbf81c9acb61caff7ee68c526ed69dd14eb9338 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
 // 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,8 +48,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 />");
        }
@@ -64,7 +63,7 @@ if ($_CONFIG['beg_rallye'] == 'Y')
        }
 
        // 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 +73,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 +84,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 +105,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));