Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

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

diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php
index bbdf02305a70f6c1df30a29aaac9143af406353e..234d0029c7fa506e0b16819f9873c748f6ea5afd 100644 (file)
--- a/inc/modules/admin/what-chk_regs.php
+++ b/inc/modules/admin/what-chk_regs.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);
 }
@@ -42,27 +41,27 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR ("admin", basename(__FILE__));
 
 // Check for accounts
-$query = SQL_QUERY("SELECT userid, sex, surname, family, email, REMOTE_ADDR, refid, user_hash FROM "._MYSQL_PREFIX."_user_data WHERE status='UNCONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, user_hash
+FROM `"._MYSQL_PREFIX."_user_data`
+WHERE status='UNCONFIRMED'
+ORDER BY userid ASC", __FILE__, __LINE__);
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
-if (SQL_NUMROWS($query) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
        // We have some (new?) registrations!
        $SW = 2; $OUT = "";
-       while (list($uid, $sex, $sname, $fname, $email, $IP, $ref, $hash) = SQL_FETCHROW($query))
-       {
+       while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $hash) = SQL_FETCHROW($result)) {
                if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                // Prepare array for the row template
                $content = array(
-                       'sw'    => $SW,
-                       'sex'   => TRANSLATE_SEX($sex),
-                       'sname' => $sname,
-                       'fname' => $fname,
-                       'email' => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
-                       'ip'    => $IP,
-                       'ref'   => $ref,
-                       'hash'  => $hash,
-                       'link'  => ADMIN_USER_PROFILE_LINK($uid),
+                       'sw'     => $SW,
+                       'gender' => TRANSLATE_GENDER($gender),
+                       'sname'  => $sname,
+                       'fname'  => $fname,
+                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+                       'ip'     => $IP,
+                       'ref'    => $ref,
+                       'hash'   => $hash,
+                       'link'   => ADMIN_USER_PROFILE_LINK($uid),
                );
 
                // Load row template and switch color
@@ -70,18 +69,18 @@ if (SQL_NUMROWS($query) > 0)
                $SW = 3 - $SW;
        }
 
-       // Free memory
-       SQL_FREERESULT($query);
+       // Remember rows
        define('__REG_ROWS', $OUT);
 
        // Load main template
        LOAD_TEMPLATE("admin_reg");
-}
- else
-{
+} else {
        // No registrations left - or all has confirmed their email address... :-)
        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_CONFIRMED_EMAIL);
 }
-CLOSE_TABLE();
+
+// Free memory
+SQL_FREERESULT($result);
+
 //
 ?>