diff -u -r -N karmapools.orig/admin/includes/admin.app.functions.php karmapools/admin/includes/admin.app.functions.php --- karmapools.orig/admin/includes/admin.app.functions.php 2004-09-13 10:04:52.000000000 -0500 +++ karmapools/admin/includes/admin.app.functions.php 2004-09-13 20:42:52.532712920 -0500 @@ -153,4 +153,58 @@ } +/***************************************************************************** + * + *****************************************************************************/ +function queryUsers($start='0',$order='un',$search='',$searchfield='') { + +if (!is_numeric($start)) { return false; } + +switch($order) { + case "ue": $orderby = 'user_email'; break; + case "ip": $orderby = 'user_ip'; break; + case "ua": $orderby = 'user_agent'; break; + case "ul": $orderby = 'user_level'; break; + case "au": $orderby = 'user_audit'; break; + default: $orderby = 'user_name'; break; + } + +$where = ''; +$wherefield = ''; +if (!empty($search) and !empty($searchfield)) { + $search = addslashes($search); + $searchfield = addslashes($searchfield); + switch ($searchfield) { + case "un": $wherefield = 'user_name'; break; + case "ue": $wherefield = 'user_email'; break; + case "ip": $wherefield = 'user_ip'; break; + case "ua": $wherefield = 'user_agent'; break; + case "ul": $wherefield = 'user_level'; break; + case "au": $wherefield = 'user_audit'; break; + } + if (!empty($wherefield)) { + $where = "where $wherefield='$searchtext'"; + } + } + +// grab the total first +$sql = "select count(user_id) from " . DBN . ".pool_users "; +$sql .= $where; +if (!$qid = db_query($sql)) { return false; } +if (!db_num_rows($qid) == 1) { return false; } + +$hits = db_result($qid,0,0); +if ($hits < 1) { return false; } + +$fl = "user_id,user_name,user_email,user_ip,user_agent,user_level,"; +$fl .= "user_audit"; +$sql = "select $fl from " . DBN . ".pool_users"; +if (!empty($where)) { $sql .= " $where"; } +$sql .= " order by $orderby limit $start," . MAX_ROWS; +if (!$qid = db_query($sql)) { return false; } + +return array('total_hits'=>$hits,'qid'=>$qid); + +} + ?> diff -u -r -N karmapools.orig/admin/includes/admin.globals.php karmapools/admin/includes/admin.globals.php --- karmapools.orig/admin/includes/admin.globals.php 2004-09-13 16:36:15.000000000 -0500 +++ karmapools/admin/includes/admin.globals.php 2004-09-13 20:29:06.388305960 -0500 @@ -15,8 +15,13 @@ // action strings define(CREATE_POOL_QS,"cp"); +define(DEL_USER_QS,"du"); define(LIST_POOL_QS,"lp"); define(LIST_USER_QS,"lu"); +define(VIEW_USER_QS,"vu"); + +// misc defaults +define(MAX_ROWS,20); // includes require_once('includes/admin.html.functions.php'); diff -u -r -N karmapools.orig/admin/includes/admin.html.functions.php karmapools/admin/includes/admin.html.functions.php --- karmapools.orig/admin/includes/admin.html.functions.php 2004-09-13 10:16:03.000000000 -0500 +++ karmapools/admin/includes/admin.html.functions.php 2004-09-13 20:40:43.497329280 -0500 @@ -6,5 +6,51 @@ *****************************************************************************/ if (basename($PHP_SELF) == basename(__FILE__)) { die("Access Denied"); } +/***************************************************************************** + * + *****************************************************************************/ +function displayUserList($echo=true,$qid='') { + +if ($qid == '') { return false; } +$num = db_num_rows($qid); +if ($num < 1) { return false; } + +$row1 = true; +$html = ''; +for ($j=0; $j < $num; $j++) { + $uid = db_result($qid,$j,0); + $un = stripslashes(db_result($qid,$j,1)); + $ue = stripslashes(db_result($qid,$j,2)); + $ip = stripslashes(db_result($qid,$j,3)); + $ua = substr(stripslashes(db_result($qid,$j,4)),0,50); + $ul = db_result($qid,$j,5); + $au = db_result($qid,$j,6); + if ($row1) { + $class = "row1"; + $row1 = false; + } else { + $class = "row2"; + $row1 = true; + } + $view_user_qs = "./?a=" . VIEW_USER_QS . "&uid=$uid"; + $view_user_href = ""; + $view_user_href .= "$un"; + $del_user_qs = "./?a=" . DEL_USER_QS . "&uid=$uid"; + $del_user_href = ""; + $del_user_href .= "D"; + $html .= "\n"; + $html .= " $view_user_href\n"; + $html .= " $ue\n"; + $html .= " $ip\n"; + $html .= " $ua\n"; + $html .= " $ul\n"; + $html .= " $au\n"; + $html .= " $del_user_href\n"; + $html .= "\n"; + } + +if ($echo) { echo $html; } else { return $html; } + +} ?> diff -u -r -N karmapools.orig/admin/user.list.php karmapools/admin/user.list.php --- karmapools.orig/admin/user.list.php 2004-09-13 17:05:03.000000000 -0500 +++ karmapools/admin/user.list.php 2004-09-13 20:42:33.806559728 -0500 @@ -15,10 +15,18 @@ $o_userid = $text . "un\">Userid"; $o_email = $text . "ue\">Email"; $o_ip = $text . "ip\">IP"; +$o_ua = $text . "ua\">User Agent"; $o_access = $text . "ul\">Access"; -$o_audit = $text . "ua\">Audit"; +$o_audit = $text . "au\">Audit"; -pageHeader(true,$title); tableOpen(true,array('width'=>'800')); +$q_ar = queryUsers(0,$o); +if (is_array($q_ar)) { + $total_hits = $q_ar['total_hits']; + $qid = $q_ar['qid']; + $hits = db_num_rows($qid); + } + +pageHeader(true,$title); tableOpen(true,array('width'=>'100%')); ?> @@ -29,12 +37,12 @@ + - E - D +   - + diff -u -r -N karmapools.orig/docs/ChangeLog karmapools/docs/ChangeLog --- karmapools.orig/docs/ChangeLog 2004-09-13 19:23:38.000000000 -0500 +++ karmapools/docs/ChangeLog 2004-09-13 20:54:03.693680944 -0500 @@ -4,6 +4,12 @@ *karmapools-0.0.4 (13 Sep 2004) + 13 Sep 2004; Mike Green docs/ChangeLog, + admin/includes/admin.app.functions.php, admin/includes/admin.globals.php, + admin/includes/admin.html.functions.php, admin/user.list.php: + + Began preliminary work on user maintenance list. Updated ChangeLog. + 13 Sep 2004; Mike Green docs/Changelog, docs/ChangeLog, patch-0.0.4-01: