Lock reason now saved in DB, deleted accounts shall be locked for re-registering...

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

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 9ecd2c4ee8776fa10390a95567128125e465a183..ea3997ab6eb46ff131441d3c5662edafdf21955a 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -64,6 +64,12 @@ if (EXT_IS_ACTIVE("nickname")) { $MORE = ", nickname"; }
 if (GET_EXT_VERSION("user") >= "0.3.4") {
        // Add it...
        $MORE .= ", rand_confirmed";
+
+       // Add lock reason?
+       if (GET_EXT_VERSION("user") >= "0.3.5") {
+               // Add them...
+               $MORE .= ", lock_reason, UNIX_TIMESTAMP(`lock_timestamp`) AS lock_timestamp";
+       } // END - if
 } // END - if
 
 // Init unset data (bad that we change $_GET here!)
@@ -117,6 +123,7 @@ LIMIT 1",
                $DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
                $DATA['total']             = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points"));
                $DATA['locked']            = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
+               $DATA['lock_timestamp']    = MAKE_DATETIME($DATA['lock_timestamp'], "2");
 
                // Nickname inclusion?
                if (EXT_IS_ACTIVE("nickname")) {
@@ -172,7 +179,8 @@ LIMIT 1",
                }
        } // END - if
 
-       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
+       // Prepare SQL and run it
+       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
@@ -231,45 +239,44 @@ LIMIT 1",
                        define('__NICKNAME_TH', "");
                }
 
+               // Load all users
                $SW = 2; $OUT = "";
-               while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $status, $emails_sent, $mails_confirmed, $emails_received, $nick) = SQL_FETCHROW($result)) {
-                       if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
-                       $LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
-                       $SENT = $emails_sent;
-                       if ($emails_sent > 0) $SENT = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($emails_sent)."</A>]";
-                       if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".TRANSLATE_COMMA($LINKS)."</A>]";
+               while ($content = SQL_FETCHARRAY($result)) {
+                       // Set refid link
+                       if ($content['refid'] > 0) $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);
+
+                       // Get number of unconfirmed mails
+                       $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", "userid", true);
+                       if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</A>]";
+
+                       // Set link to sent mails if present
+                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</A>]";
 
                        // Add nickname
-                       if (empty($nick) || $nick == $uid) $nick = "---";
+                       if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---";
 
                        // Calculate total points
-                       $pointsTotal = GET_TOTAL_DATA($uid, "user_points", "points")  - GET_TOTAL_DATA($uid, "user_data", "used_points");
+                       $pointsTotal = GET_TOTAL_DATA($content['userid'], "user_points", "points")  - GET_TOTAL_DATA($content['userid'], "user_data", "used_points");
 
                        // Clickrate
                        $clickRate = 0;
-                       if ($emails_received > 0) {
-                               $clickRate = $mails_confirmed / $emails_received * 100;
+                       if ($content['emails_received'] > 0) {
+                               $clickRate = $content['mails_confirmed'] / $content['emails_received'] * 100;
                        } // END - if
 
                        // Transfer data to array
-                       $content = array(
-                               'sw'     => $SW,
-                               'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-                               'gender' => TRANSLATE_GENDER($gender),
-                               'sname'  => $sname,
-                               'fname'  => $fname,
-                               'email'  => "[<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>]",
-                               'addr'   => $IP,
-                               'ref'    => $ref,
-                               'status' => TRANSLATE_STATUS($status),
-                               'links'  => $LINKS,
-                               'nick'   => $nick,
-                               'alinks' => MEMBER_ACTION_LINKS($uid, $status),
-                               'points' => TRANSLATE_COMMA($pointsTotal),
-                               'sent'   => $SENT,
-                               'rate'   => TRANSLATE_COMMA($clickRate),
-                               'locked' => TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"))
-                       );
+                       $content['sw']     = $SW;
+                       $content['uid']    = ADMIN_USER_PROFILE_LINK($content['userid']);
+                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                       $content['email']  = "[<A href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</A>]";
+                       $content['addr']   = $content['REMOTE_ADDR'];
+                       $content['status'] = TRANSLATE_STATUS($content['status']);
+                       $content['links']  = $LINKS;
+                       $content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
+                       $content['points'] = TRANSLATE_COMMA($pointsTotal);
+                       $content['rate']   = TRANSLATE_COMMA($clickRate);
+                       $content['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
+                       $content['lock_timestamp'] = MAKE_DATETIME($content['lock_timestamp'], "2");
 
                        // Load row template and switch colors
                        $OUT .= LOAD_TEMPLATE("admin_list_user_row", true, $content);