admin list shows newest users first

[sql-web.git] / admin / main.php

diff --git a/admin/main.php b/admin/main.php
index 4a7a74944c451e0cb6d71be21ec83dd8688ee328..0852432155ab093d2d6e5191a4967e792a3603c7 100755 (executable)
--- a/admin/main.php
+++ b/admin/main.php
@@ -11,14 +11,49 @@ if ((isAdmin() || isImpersonating()) && isset($i_impersonate)) {
 
 if (!isAdmin()) redirectStart();
 
-$sql = sprintf("SELECT Username,Name,UserId FROM User WHERE bEnabled=1");
+//                             INNER JOIN UserStat ON User.UserId = UserStat.UserId
+$sql = sprintf("SELECT User.UserId,Username,Name,dSignup,dLastCheck,nBytes,nBytesSoft,nBytesHard
+                               FROM User
+                               NATURAL JOIN UserStat
+                               NATURAL JOIN UserQuota
+                               WHERE bEnabled=1
+                               ORDER BY dSignup DESC");
+//                             ORDER BY nBytes DESC");
 $users = fetchRows(DBSelect($sql),'UserId');
 
 include 'tpl/head.php';
 
+?>
+<style>
+table.usertable td {
+       border: 1px solid black;
+       padding: 1px 2px 1px 2px;
+}
+</style>
+<?php
+
+echo '<table cellspacing="0" cellpadding="0" class="usertable">';
 foreach($users as $id=>$user) {
-       echo '<a href="',newQSA(array('impersonate'=>$id)),'">',$user['Username'],'</a> (',$user['Name'],')<br />';
+       echo '<tr><td>',
+               $user['UserId'],
+               '</td><td>',
+               '<a href="do/admin/main',newQSA(array('impersonate'=>$id)),'">',
+               $user['Username'],
+               '</a></td><td>',
+               $user['Name'],
+               '</td><td>',
+               sprintSize($user['nBytes']),
+               '</td><td>',
+               sprintSize($user['nBytesHard']),
+               '</td><td>',
+               $user['dSignup'],
+               '</td><td>',
+               $user['dLastCheck'],
+               '</td></tr>';
 }
+echo '</table>';
+
+echo '<em>',count($users),' users</em>';
 
 include 'tpl/foot.php';