X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=605130d63debc995f090fb2187ebf41694338363;hb=f13b0c89b6dce2dc31ef3c58f0e2ad4821d7bee8;hp=7fe2287fa09dd131b08dead4f3d7df942b2a861a;hpb=0369c36aaab5af6ed44da1e13a53baef285f79b4;p=mailer.git diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 7fe2287fa0..605130d63d 100644 --- 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,7 +107,7 @@ 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 ON l.userid=u.userid @@ -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' => "".TRANSLATE_SEX($sex)." ".$sname." ".$fname."", + 'email' => "".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."", 'status' => TRANSLATE_STATUS($status), );