Re-added, now the right ones

[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..c6a4dcde2c2806798b4565c670286b77b8017540 100644 (file)
--- a/inc/modules/admin/what-chk_regs.php
+++ b/inc/modules/admin/what-chk_regs.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Neue Anmeldungen pruefen                         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,8 +37,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 +46,30 @@ 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))
-       {
-               if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
+       $OUT = ""; $SW = 2;
+       while ($content = SQL_FETCHARRAY($result)) {
+               // Add link to refid
+               if ($content['refid'] > 0) $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);
+
                // Prepare array for the row template
+               // @TODO Rewritings: sname->surname,fname->family,ip->REMOTE_ADDR,ref->refid,hash->user_hash in 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($content['gender']),
+                       'sname'  => $content['surname'],
+                       'fname'  => $content['family'],
+                       'email'  => "<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>",
+                       'ip'     => $content['REMOTE_ADDR'],
+                       'ref'    => $content['refid'],
+                       'hash'   => $content['user_hash'],
+                       'link'   => ADMIN_USER_PROFILE_LINK($content['userid']),
                );
 
                // Load row template and switch color
@@ -70,18 +77,19 @@ if (SQL_NUMROWS($query) > 0)
                $SW = 3 - $SW;
        }
 
-       // Free memory
-       SQL_FREERESULT($query);
+       // Remember rows
+       // @TODO Rewrite this constant
        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);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_CONFIRMED_EMAIL'));
 }
-CLOSE_TABLE();
+
+// Free memory
+SQL_FREERESULT($result);
+
 //
 ?>