admin usertable paging and sort

URI fixed to REDIRECT_URI instead of REQUEST_URI

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

diff --git a/admin/main.php b/admin/main.php
index 0852432155ab093d2d6e5191a4967e792a3603c7..2575ca794990097c122a74d58e59e9d33b770fa0 100755 (executable)
--- a/admin/main.php
+++ b/admin/main.php
@@ -11,14 +11,37 @@ if ((isAdmin() || isImpersonating()) && isset($i_impersonate)) {
 
 if (!isAdmin()) redirectStart();
 
-//                             INNER JOIN UserStat ON User.UserId = UserStat.UserId
-$sql = sprintf("SELECT User.UserId,Username,Name,dSignup,dLastCheck,nBytes,nBytesSoft,nBytesHard
+empty($i_pagesize) && $i_pagesize=20;
+empty($i_page) && $i_page=1;
+empty($i_sortby) && $i_sortby='dSignup';
+empty($i_sortorder) && $i_sortorder=0;
+
+if ($i_sortorder>0) $sortSQL = 'ASC'; else $sortSQL = 'DESC';
+
+$i_pagesize = mysql_escape_string($i_pagesize);
+$i_page = mysql_escape_string($i_page);
+$i_sortby = mysql_escape_string($i_sortby);
+
+$columns = array('','Username','Name','nBytes','nBytesHard','nBytesOver','dSignup');
+
+$userCount = 0;
+$sqlc = "SELECT COUNT(*) as c FROM User WHERE bEnabled=1";
+$r = fetchRows(DBSelect($sqlc));
+$r = array_shift($r);
+count($r) && $userCount = array_shift($r);
+
+$sql = sprintf("SELECT User.UserId,Username,Name,dSignup,dLastCheck,nBytes,nBytesSoft,nBytesHard,
+                                       IF(nBytes>nBytesHard,nBytes-nBytesHard,0) as nBytesOver
                                FROM User
                                NATURAL JOIN UserStat
                                NATURAL JOIN UserQuota
                                WHERE bEnabled=1
-                               ORDER BY dSignup DESC");
-//                             ORDER BY nBytes DESC");
+                               ORDER BY $i_sortby $sortSQL");
+
+$sql .= ' LIMIT '.($i_page-1)*$i_pagesize.','.$i_pagesize;
+$pageArray = range(1,ceil($userCount/$i_pagesize));
+$pageCount = count($pageArray);
+
 $users = fetchRows(DBSelect($sql),'UserId');
 
 include 'tpl/head.php';
@@ -27,34 +50,60 @@ include 'tpl/head.php';
 <style>
 table.usertable td {
        border: 1px solid black;
-       padding: 1px 2px 1px 2px;
+       padding: 0px 2px 0px 2px;
 }
 </style>
 <?php
 
+echo '<em>',$userCount,' users</em> | ';
+if ($i_page > 1) $tPagePrev = ' <a href="'.$URI.newQS('page',$i_page-1).'">Prev</a>'; else $tPagePrev = 'First';
+if ($i_page < $pageCount) $tPageNext = ' <a href="'.$URI.newQS('page',$i_page+1).'">Next</a>'; else $tPageNext = 'Last';
+if (!empty($tPageNext) && empty($tPagePrev)) echo($tPageNext);
+elseif (empty($tPageNext) && !empty($tPagePrev)) echo($tPagePrev);
+else echo "$tPagePrev | $tPageNext";
+
+/*
+echo ' | Skip to: ';
+foreach($pageArray as $availablePage) {
+       echo ' <a href="'.$URI.newQS('page',$availablePage).'">'.$availablePage.'</a>';
+}
+*/
+
+echo ' | Page '.$i_page.' of '.$pageCount.' by '.$i_sortby;
+
 echo '<table cellspacing="0" cellpadding="0" class="usertable">';
+echo '<thead>';
+foreach($columns as $column) {
+       if (!empty($column)) {
+               $qsa = array('sortby'=>$column);
+               if ($column==$i_sortby)
+                       $qsa['sortorder']=abs($i_sortorder-1);
+               echo '<td><a href="'.$URI.newQSA($qsa).'">'.$column.'</a></td>';
+       } else echo '<td></td>';
+}
+echo '</thead>';
 foreach($users as $id=>$user) {
        echo '<tr><td>',
                $user['UserId'],
                '</td><td>',
                '<a href="do/admin/main',newQSA(array('impersonate'=>$id)),'">',
                $user['Username'],
-               '</a></td><td>',
+               '</a></td><td><a href="http://web.mit.edu/bin/cgicso?query='.$user['Username'].'" target="_new">',
                $user['Name'],
-               '</td><td>',
+               '</a></td><td>',
                sprintSize($user['nBytes']),
                '</td><td>',
                sprintSize($user['nBytesHard']),
                '</td><td>',
-               $user['dSignup'],
+               sprintSize($user['nBytesOver']),
                '</td><td>',
-               $user['dLastCheck'],
+               $user['dSignup'],
+//             '</td><td>',
+//             $user['dLastCheck'],
                '</td></tr>';
 }
 echo '</table>';
 
-echo '<em>',count($users),' users</em>';
-
 include 'tpl/foot.php';
 
 ?>

diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index 491429c04a80750a9bfe9b0db5902791e76d0186..870266061d9042a4fdeda19106fdacf98a235d98 100755 (executable)
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -26,7 +26,8 @@ defined('ADMINPASS') || define('ADMINPASS', base64_decode('TXlCZWF0c1Bvc3RA'));
 defined('ADMINDB') || define('ADMINDB', 'mitsql');
 
 $BASE_PATH = dirname(__FILE__).'/';
-$URI = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
+$URI = (isset($_SERVER["REDIRECT_URL"])?$_SERVER["REDIRECT_URL"]:'');
+$URI = ((empty($URI) && isset($_SERVER['REQUEST_URI']))?$_SERVER['REQUEST_URI']:$URI);
 
 set_time_limit(0);
 ignore_user_abort(1);