X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/53f8750e5b66b6986b35b8fc38fbb1c2ab17095f..1050fbb732198f8336ab0708c2aed221d864a1b7:/admin/main.php

diff --git a/admin/main.php b/admin/main.php
index 5f6535b..f4ee825 100755
--- a/admin/main.php
+++ b/admin/main.php
@@ -11,14 +11,32 @@ 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,nBytes
+				FROM User
+				NATURAL JOIN UserStat
+				WHERE bEnabled=1
+				ORDER BY dSignup");
 $users = fetchRows(DBSelect($sql),'UserId');
 
 include 'tpl/head.php';
 
+echo '<table cellspacing="3">';
 foreach($users as $id=>$user) {
-	echo '<a href="do/admin/main',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>',
+		$user['dSignup'],
+		'</td></tr>';
 }
+echo '</table>';
 
 include 'tpl/foot.php';