A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...
[mailer.git] / inc / modules / admin / what-list_user.php
index ce84588bad234c8522f61b612152a6f4bf5621e7..da272fda88862c89476832a9d4f8a72c26493233 100644 (file)
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
        // Missing extension!
-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
        return;
 }
 
@@ -45,120 +45,214 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Init title with "all accounts"
-$listHeader = ADMIN_ALL_ACCOUNTS;
-if (!empty($_GET['mode'])) {
+$listHeader = getMessage('ADMIN_ALL_ACCOUNTS');
+if (REQUEST_ISSET_GET(('status'))) {
+       // Set title according to the "status"
+       $listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(REQUEST_GET(('status')))));
+} elseif (REQUEST_ISSET_GET(('mode'))) {
        // Set title according to the "mode"
-       $listHeader = constant(sprintf("ADMIN_LIST_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['mode']))));
-} // END - if
+       $listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(REQUEST_GET(('mode')))));
+}
 
 // Remember it
 define('__TITLE', $listHeader);
 
-$MORE = ", userid"; $colspan = "4"; //                 27
+// Init variables
+$MORE = ", userid"; $colspan = "4";
+
+// Add nickname if extension is found&active
 if (EXT_IS_ACTIVE("nickname")) { $MORE = ", nickname"; }
 
-if (empty($_GET['letter'])) { $_GET['letter'] = _ALL2;    }
-if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
-if (empty($_GET['page']))   { $_GET['page']   = "1";      }
+// Add random confirmed if extension version matches
+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
+
+// Is the extension "country" installed?
+if (EXT_IS_ACTIVE("country")) {
+       // Add country code
+       $MORE .= ", country_code";
+} else {
+       // Add direct value
+       $MORE .= ", country";
+}
+
+// Init unset data (bad that we change $_GET here!)
+if (!REQUEST_ISSET_GET(('letter'))) { REQUEST_SET_GET('letter', getMessage('_ALL2')); }
+if (!REQUEST_ISSET_GET(('sortby'))) { REQUEST_SET_GET('sortby', "userid");            }
+if (!REQUEST_ISSET_GET(('page')))   { REQUEST_SET_GET('page'  , "1");                 }
 
 // Set base URL
-$BASE = "[<A href=\"".URL."/modules.php?module=admin";
+$BASE = "[<a href=\"{!URL!}/modules.php?module=admin";
 
-if (!empty($_GET['u_id'])) {
+if (REQUEST_ISSET_GET(('uid'))) {
        // Secure the user ID
-       $uid = bigintval($_GET['u_id']);
-
-       // Does the account exists?        0      1        2         3       4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
-       $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
-FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%s LIMIT 1",
-        array($uid), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1) {
+       $uid = bigintval(REQUEST_GET('uid'));
+
+       // Does the account exists?
+       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout, emails_received, mails_confirmed".$MORE."
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE userid=%s
+LIMIT 1",
+               array($uid), __FILE__, __LINE__);
+       if (SQL_NUMROWS($result_user) == 1) {
                // Account found!
-               $DATA  = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $DATA  = SQL_FETCHARRAY($result_user);
 
+               // Get count/sum of refs, selected categories, unconfirmed mails
                $REFS  = GET_TOTAL_DATA($uid, "refsystem", "counter");
                $CATS  = GET_TOTAL_DATA($uid, "user_cats", "id", "userid", true);
                $LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
 
-               if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>]";
-               if ($DATA[13] > 0) $DATA[13] = str_replace(("u_id=".$uid), ("u_id=".$DATA[13]), $BASE."&amp;what=list_user\">".$DATA[13]."</A>]");
-               if (empty($DATA[17])) $DATA[17] = "---";
-               if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</A>]";
-               if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</A>]";
+               // Add links to the numbers
+               if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;uid=".$uid."\">".$LINKS."</a>]";
+               if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;uid=".$DATA['refid']."\">".$DATA['refid']."</a>]";
+               if (empty($DATA['last_module'])) $DATA['last_module'] = "---";
+               if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;uid=".$uid."\">".$REFS."</a>]";
+               if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;uid=".$uid."\">".$CATS."</a>]";
+
+               // Calculate timestamp for birthday
+               $stamp = mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']);
+
+               // Is this above zero?
+               if ($stamp > 0) {
+                       // Then use it
+                       define('_BIRTHDAY', MAKE_DATETIME($stamp, "3"));
+               } else {
+                       // Zero or below so set zero!
+                       define('_BIRTHDAY', MAKE_DATETIME(0, "3"));
+               }
 
                // Prepare data for template
-               define('_BIRTHDAY', MAKE_DATETIME(mktime(0, 0, 0, $DATA[9], $DATA[8], $DATA[10]), "3"));
                define('_REFS' , $REFS);
                define('_CATS' , $CATS);
                define('_LINKS', $LINKS);
-               define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA[14]));
-               $DATA[0]      = TRANSLATE_GENDER($DATA[0]);
-               $DATA[28]     = CREATE_EMAIL_LINK($DATA[7], "user_data");
-               $DATA[14]     = TRANSLATE_STATUS($DATA[14]);
-               $DATA[16]     = MAKE_DATETIME($DATA[16], "0");
-               $DATA[20]     = TRANSLATE_COMMA($DATA[20]);
-               if ($DATA[21] > 0) $DATA[21] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA[21])."</A>]";
-               $DATA[22]     = MAKE_DATETIME($DATA[22], "0");
-               $DATA[23]     = MAKE_DATETIME($DATA[23], "0");
-               $DATA[24]     = MAKE_DATETIME($DATA[24], "0");
-               if ((empty($DATA[27])) || ($DATA[27] == $uid)) $DATA[27] = "---";
-               $DATA['total']  = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points"));
-               $DATA['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
-
+               define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA['status']));
+               $DATA['gender']            = TRANSLATE_GENDER($DATA['gender']);
+               $DATA['email_link']        = CREATE_EMAIL_LINK($DATA['email'], "user_data");
+               $DATA['status']            = TRANSLATE_STATUS($DATA['status']);
+               $DATA['last_online']       = MAKE_DATETIME($DATA['last_online'], "0");
+               $DATA['used_points']       = TRANSLATE_COMMA($DATA['used_points']);
+               if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;uid=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</a>]";
+               $DATA['joined']            = MAKE_DATETIME($DATA['joined'], "0");
+               $DATA['last_update']       = MAKE_DATETIME($DATA['last_update'], "0");
+               $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");
+
+               // Is the lock reason not set?
+               if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = "---";
+
+               // Nickname inclusion?
+               // @TODO Rewrite these to filters
                if (EXT_IS_ACTIVE("nickname")) {
-                       if ((empty($DATA[27])) || ($DATA[27] == $uid)) $DATA[27] = "---";
+                       // Nickname not set or invalid? Then 
+                       if ((empty($DATA['nickname'])) || ($DATA['nickname'] == $uid)) $DATA['nickname'] = "---";
                } else {
-                       $DATA[27] = EXT_NICKNAME_404;
+                       // Extension not found
+                       $DATA['nickname'] = getMessage('EXT_NICKNAME_404');
+               }
+
+               // Is the user extension newer?
+               if (GET_EXT_VERSION("user") >= "0.3.4") {
+                       // Then "translate" the number
+                       $DATA['rand_confirmed'] = TRANSLATE_COMMA($DATA['rand_confirmed']);
+               } // END - if
+
+               // Clickrate
+               $DATA['click_rate'] = 0;
+               if ($DATA['emails_received'] > 0) {
+                       $DATA['click_rate'] = TRANSLATE_COMMA($DATA['mails_confirmed'] / $DATA['emails_received'] * 100);
+               } // END - if
+
+               // "Translate" more data
+               $DATA['mails_confirmed'] = TRANSLATE_COMMA($DATA['mails_confirmed']);
+               $DATA['emails_received'] = TRANSLATE_COMMA($DATA['emails_received']);
+
+               // Is the extension "country" installed?
+               if (EXT_IS_ACTIVE("country")) {
+                       // Then overwrite country information
+                       $DATA['country'] = COUNTRY_GENERATE_INFO($DATA['country_code']);
+               } elseif ($DATA['country'] == 0) {
+                       // Zero ID???
+                       $DATA['country'] = "???";
                }
 
-               // Template laden
+               // Load user-details template
                LOAD_TEMPLATE("admin_user_details", false, $uid);
        } else {
-               // Account does not exists!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.$uid.ADMIN_MEMBER_404_2);
+               // Account does not exist!
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), $uid));
        }
+
+       // Free the result
+       SQL_FREERESULT($result_user);
 } else {
        $whereStatement = "";
-       if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter']))) {
+       if ((REQUEST_GET('letter') != getMessage('_ALL2')) && (REQUEST_GET('letter') != getMessage('_OTHERS')) && (REQUEST_ISSET_GET(('letter')))) {
                // List only persons w
-               $whereStatement = " WHERE family LIKE '".$_GET['letter']."%'";
+               $whereStatement = " WHERE family LIKE '".REQUEST_GET('letter')."%'";
        } // END - if
-       if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
+       if (REQUEST_GET('sortby') == "family_name") REQUEST_SET_GET('sortby', "family");
 
-       // Parse the mode parameter
-       if (isset($_GET['mode'])) {
+       // Parse the status or mode parameter
+       if (REQUEST_ISSET_GET(('status'))) {
                // Is a WHERE statement already there?
                if (!empty($whereStatement)) {
                        // Then append the status column
-                       $whereStatement .= sprintf(" AND status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['mode']))));
+                       $whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper(REQUEST_GET('status')))));
                } else {
                        // Start a new one
-                       $whereStatement = sprintf(" WHERE status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['mode']))));
+                       $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper(REQUEST_GET('status')))));
                }
-       } // END - if
+       } elseif (REQUEST_ISSET_GET(('mode'))) {
+               // Choose what we need to list
+               switch (REQUEST_GET('mode')) {
+                       case "norefs": // Users w/o refs
+                               if (!empty($whereStatement)) {
+                                       // Add AND statement
+                                       $whereStatement .= " AND refid=0";
+                               } else {
+                                       // Add WHERE statement
+                                       $whereStatement = " WHERE refid=0";
+                               }
+                               break;
+
+                       default: // Invalid list mode
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", REQUEST_GET(('mode'))));
+                               break;
+               }
+       } // 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'];
-       $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
+       // 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 ".REQUEST_GET(('sortby'));
+       $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
-       if ($_CONFIG['user_limit'] == 0) {
-               $_CONFIG['user_limit'] = 100;
-               LOAD_TEMPLATE("admin_settings_saved", false, EXTENSION_WARNING_USER_LIMIT);
+       if (getConfig('user_limit') == 0) {
+               setConfigEntry('user_limit', 100);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('EXTENSION_WARNING_USER_LIMIT'));
        } // END - if
 
        // Activate the extension please!
-       $PAGES = round(SQL_NUMROWS($result_master) / $_CONFIG['user_limit'] + 0.5);
+       $PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
 
-       if (empty($_GET['page']))   $_GET['page']   = "1";
-       if (empty($_GET['offset'])) $_GET['offset'] = $_CONFIG['user_limit'];
+       if (!REQUEST_ISSET_GET(('page')))   REQUEST_SET_GET('page'  , "1");
+       if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('user_limit'));
 
        // Add limitation to SQL string and run him again
-       $SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
-       $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+       $sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
+       $result = SQL_QUERY($sql, __FILE__, __LINE__);
 
-       $result_user = SQL_QUERY("SELECT emails_sent FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED'", __FILE__, __LINE__);
+       $result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED'", __FILE__, __LINE__);
        $user_count = SQL_NUMROWS($result_user);
        SQL_FREERESULT($result_user);
 
@@ -171,72 +265,78 @@ WHERE userid=%s LIMIT 1",
                define('__COLSPAN2'  , ($colspan + 2));
                define('__USER_CNT'  , $user_count);
 
-               if ((function_exists('alpha')) && (function_exists('SortLinks'))) {
-                       define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
-                       define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
-               } else {
-                       define('__ALPHA_SORT', "");
-                       define('__SORT_LINKS', "");
-               }
+               // Sorting links
+               define('__ALPHA_SORT', alpha(REQUEST_GET('sortby'), $colspan, true));
+               define('__SORT_LINKS', SortLinks(REQUEST_GET('letter'), REQUEST_GET('sortby'), $colspan, true));
 
                if ($PAGES > 1) {
-                       define('__PAGE_NAV', ADD_PAGENAV($PAGES, $_CONFIG['user_limit'], true, $colspan, true));
+                       define('__PAGE_NAV', ADD_PAGENAV($PAGES, getConfig('user_limit'), true, $colspan, true));
                } else {
                        // No page navigation is required
                        define('__PAGE_NAV', "");
                }
 
                // Column with nickname when nickname extension is present
-               if (EXT_IS_ACTIVE("nickname"))
-               {
+               // @TODO Rewrite this into a  filter
+               if (EXT_IS_ACTIVE("nickname")) {
                        // Nickname extension found
-                       define('__NICKNAME_TH', "  <TD class=\"admin_title bottom2\" align=\"center\">".NICKNAME."</TD>");
-               }
-                else
-               {
+                       define('__NICKNAME_TH', "  <td class=\"admin_title bottom2\" align=\"center\">{--NICKNAME--}</td>");
+               } else {
                        // Not found
                        define('__NICKNAME_TH', "");
                }
 
-               $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>]";
+               // Load all users
+               $OUT = ""; $SW = 2;
+               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;uid=".$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;uid=".$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['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");
+                       $content['status'] = TRANSLATE_STATUS($content['status']);
+
+                       // Is the lock reason not set?
+                       if (!isset($content['lock_reason'])) $content['lock_reason'] = "---";
+
+                       // Is the extension "country" installed?
+                       // @TODO Rewrite this into a filter
+                       if (EXT_IS_ACTIVE("country")) {
+                               // Then overwrite country information
+                               $content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);
+                       } elseif ($content['country'] == "") {
+                               // Zero ID???
+                               $content['country'] = "???";
+                       }
 
                        // Load row template and switch colors
                        $OUT .= LOAD_TEMPLATE("admin_list_user_row", true, $content);
@@ -255,7 +355,7 @@ WHERE userid=%s LIMIT 1",
                SQL_FREERESULT($result_master);
        } else {
                // No one as registered so far! :-(
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_NONE_REGISTERED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_NONE_REGISTERED'));
        }
 }