Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

[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 7fe2287fa09dd131b08dead4f3d7df942b2a861a..86bf30742befc4f04b25fa159dbd4629d5acab05 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -32,7 +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("mailid")) {
@@ -41,7 +41,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
 }
 
 // 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;
@@ -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),
                                );