added phpMyAdmin to menu

updated admin page to show bytes and signup

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@69 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/admin/main.php b/admin/main.php
index 5f6535be0773986bfaaf2a78c9782a36bb4125e5..f4ee825370267933299840b23cabe480fd04c658 100755 (executable)
--- 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';
 

diff --git a/tpl/menu.php b/tpl/menu.php
index a9d60831f6f32fb0d0f9cd111a2069e8b314328b..3060e24767d83491fef78535105c0a4e70128a8c 100644 (file)
--- a/tpl/menu.php
+++ b/tpl/menu.php
@@ -17,8 +17,9 @@
 Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>
 <?php else: ?>
 <div style="float:left; position: relative;">
-<a href="do/index">Home</a> |
-<a href="do/signup">Sign up</a>
+<a href="do/signup">Sign up</a> |
+<a href="/~sql/phpMyAdmin/" target="_blank">phpMyAdmin</a> |
+<a href="do/index">Home</a>
 </div>
 <div style="float: right;">
 Login via <a href="do/login?ssl=0">SQL Password</a> or <a href="do/login?ssl=1">MIT Certificate</a>