Security line in all includes changed

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index b7cb9d06359eac502f7b96a1a34e2ccf38afabf9..94485d633e5d56d9f1190c35c72461f82f940cd4 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 //
 function RALLYE_AUTOSTART_RALLYES($result)
 {
@@ -481,12 +481,12 @@ function RALLYE_LOAD_USER_DATA($uids_array)
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
-       $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
-       while (list($u, $sex, $surname, $family, $email) = SQL_FETCHROW($result))
+       while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
        {
-               $ret .= TRANSLATE_SEX($sex)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
+               $ret .= TRANSLATE_GENDER($gender)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
        }
 
        // Return result