HTML->XHTML preparation (still *A LOT* to convert

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

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index a4cfc7b654f6e698a546159b0db7d32df517c7de..85b939cc8002858e8b06d1beca0480636987533f 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -32,16 +32,16 @@
  ************************************************************************/
 
 // 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("mailid")) {
-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Don't load the admin_list_unconfirmed template by default
 $listed = false;
@@ -96,7 +96,7 @@ if ($listed)
 
                // Transfer data to constants for the template
                if (($stats_id > 0) && ($ID == "-1")) $ID = $stats_id;
-               if ($col == "bonus_id") $sender = "0";
+               if ($col == "bonus_id") $sender = 0;
                define('__LIST_UNCON_SENDER' , $sender);
                define('__LIST_UNCON_SUBJECT', COMPILE_CODE($subj));
                define('__LIST_UNCON_TEXT'   , COMPILE_CODE($text));
@@ -107,12 +107,12 @@ if ($listed)
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
                //
-               $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.sex, u.email
+               $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email
 FROM "._MYSQL_PREFIX."_user_links AS l
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS u
 ON l.userid=u.userid
 WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
- array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+                       array($col, $ID, bigintval($max)),__FILE__, __LINE__);
                $unconfirmed = SQL_NUMROWS($result);
                define('__LIST_UNCO_UNCONFIRMED', $unconfirmed);
 
@@ -121,7 +121,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                        // At least one link left to confirm
                        $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
                        $SW = 2;
-                       while(list($uid, $status, $sname, $fname, $sex, $email) = SQL_FETCHROW($result))
+                       while(list($uid, $status, $sname, $fname, $gender, $email) = SQL_FETCHROW($result))
                        {
                                // Prepare data for the row template
                                $content = array(
@@ -130,7 +130,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                                        'uid'    => $uid,
                                        'link'   => $LINK,
                                        'id'     => $ID,
-                                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>",
+                                       'email'  => "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>",
                                        'status' => TRANSLATE_STATUS($status),
                                );
 
@@ -158,9 +158,9 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
         elseif ($_GET['mid'] > 0)
        {
                // Data in pool or in user_stats not found, so let's find out where data is missing
-               $result1 = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
+               $result1 = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
                 array(bigintval($ID)), __FILE__, __LINE__);
-               $result2 = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%d LIMIT 1",
+               $result2 = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
                 array(bigintval($ID)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result1) == 1)
                {