Security line in all includes changed

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

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index f8f5982e0df91eefd9180a1c5883d981428958f8..95845f42ab273af6aaa3add23b2f4f99af5a245c 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
@@ -72,7 +71,7 @@ if (!empty($_GET['u_id']))
        $uid = bigintval($_GET['u_id']);
 
        // Does the account exists?       0      1        2         3      4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
-       $result = SQL_QUERY_ESC("SELECT sex, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
+       $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
 FROM "._MYSQL_PREFIX."_user_data
 WHERE userid=%s LIMIT 1",
         array($uid), __FILE__, __LINE__);
@@ -98,7 +97,7 @@ WHERE userid=%s LIMIT 1",
                define('_CATS' , $CATS);
                define('_LINKS', $LINKS);
                define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA[14]));
-               $DATA[0]      = TRANSLATE_SEX($DATA[0]);
+               $DATA[0]      = TRANSLATE_GENDER($DATA[0]);
                $DATA[28]     = CREATE_EMAIL_LINK($DATA[7], "user_data");
                $DATA[14]     = TRANSLATE_STATUS($DATA[14]);
                $DATA[16]     = MAKE_DATETIME($DATA[16], "0");
@@ -148,7 +147,7 @@ WHERE userid=%s LIMIT 1",
                }
        }
 
-       $SQL = "SELECT userid, sex, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
+       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
@@ -209,7 +208,7 @@ WHERE userid=%s LIMIT 1",
                }
 
                $SW = 2; $OUT = "";
-               while (list($uid, $sex, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
+               while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
                {
                        if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                        $LINKS = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_links", "id", "userid", true));
@@ -222,7 +221,7 @@ WHERE userid=%s LIMIT 1",
                        $content = array(
                                'sw'     => $SW,
                                'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-                               'sex'    => TRANSLATE_SEX($sex),
+                               'gender' => TRANSLATE_GENDER($gender),
                                'sname'  => $sname,
                                'fname'  => $fname,
                                'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",