admin searching

base_url dependent on devel status
error handler outputs errors for devel

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

diff --git a/admin/main.php b/admin/main.php
index 2575ca794990097c122a74d58e59e9d33b770fa0..c4bea86882c8fbd982759cc41ca666be9b9a3808 100755 (executable)
--- a/admin/main.php
+++ b/admin/main.php
@@ -15,28 +15,33 @@ empty($i_pagesize) && $i_pagesize=20;
 empty($i_page) && $i_page=1;
 empty($i_sortby) && $i_sortby='dSignup';
 empty($i_sortorder) && $i_sortorder=0;
+!isset($i_search) && $i_search='';
 
 if ($i_sortorder>0) $sortSQL = 'ASC'; else $sortSQL = 'DESC';
 
 $i_pagesize = mysql_escape_string($i_pagesize);
 $i_page = mysql_escape_string($i_page);
+$i_search = mysql_escape_string($i_search);
 $i_sortby = mysql_escape_string($i_sortby);
 
+$sql_search = empty($i_search)?'':" AND Username LIKE '%$i_search%' ";
+
 $columns = array('','Username','Name','nBytes','nBytesHard','nBytesOver','dSignup');
 
 $userCount = 0;
-$sqlc = "SELECT COUNT(*) as c FROM User WHERE bEnabled=1";
+$sqlc = "SELECT COUNT(*) as c FROM User WHERE bEnabled=1 $sql_search";
 $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,
+$sql = "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 $i_sortby $sortSQL");
+                               $sql_search
+                               ORDER BY $i_sortby $sortSQL";
 
 $sql .= ' LIMIT '.($i_page-1)*$i_pagesize.','.$i_pagesize;
 $pageArray = range(1,ceil($userCount/$i_pagesize));
@@ -70,7 +75,14 @@ foreach($pageArray as $availablePage) {
 */
 
 echo ' | Page '.$i_page.' of '.$pageCount.' by '.$i_sortby;
-
+?>
+<span></span>
+<form method=get id=search name=search>
+<input type=text name=search value="<?=$i_search?>" />
+<input type=submit value="Search" />
+<input type=button value="Clear" onClick="document.forms['search']['search'].value = ''; document.forms['search'].submit();" />
+</form>
+<?php
 echo '<table cellspacing="0" cellpadding="0" class="usertable">';
 echo '<thead>';
 foreach($columns as $column) {

diff --git a/lib/errorhandler.lib.php b/lib/errorhandler.lib.php
index 6f760fc69da6b08d7996ba9593ca62cc02f4d339..cbbac4ede10dc0f24ce537d8755873460b2dab05 100644 (file)
--- a/lib/errorhandler.lib.php
+++ b/lib/errorhandler.lib.php
@@ -34,8 +34,8 @@ function ErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
        }
        $error_bt = ErrorBacktrace(debug_backtrace());
        $error_msg = $type . ':' . $error_msg . "\n" . $error_bt . "\n\n";
-       if (DEVEL && 0) {
-               echo nl2br($error_msg);
+       if (DEVEL) {
+               echo '<table width="100%" bgcolor="white"><tr><td><pre>'.$error_msg.'</pre></td></tr></table>';
        } else {
                $error_msg .= print_r(get_included_files(),1)."\n";
                $error_msg .= print_r($errcontext,1);

diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index 523f4665b9a4a516300d88797d5e21eae0887626..6a5acfda080832a5c119e6d8905b3129491fad0c 100755 (executable)
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -17,13 +17,14 @@ defined('OFFLINE') || define('OFFLINE', 0);
 define('VER', '1.2');
 if (DEVEL) {
        define('VERSION', VER.'-dev');
+       defined('BASE_URL') || define('BASE_URL', '/~sql/dev/');
 } else {
        define('VERSION', VER);
+       defined('BASE_URL') || define('BASE_URL', '/~sql/main/');
 }
 
 define('DELIMETER', '+');
 defined('DBHOST') || define('DBHOST', 'sql.mit.edu');
-defined('BASE_URL') || define('BASE_URL', '/~sql/main/');
 defined('ADMINUSER') || define('ADMINUSER', 'root');
 defined('ADMINPASS') || die('Please email sql@mit.edu');
 defined('ADMINDB') || define('ADMINDB', 'mitsql');