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-14 09:03:21.000000000 -0500 +++ karmapools/admin/includes/admin.app.functions.php 2004-09-14 09:54:25.706103096 -0500 @@ -172,8 +172,8 @@ $where = ''; $wherefield = ''; if (!empty($search) and !empty($field)) { - $search = addslashes($search); - $field = addslashes($field); + $search = addslashes(urldecode($search)); + $field = addslashes(urldecode($field)); switch ($field) { case "un": $wherefield = 'user_name'; break; case "ue": $wherefield = 'user_email'; break; 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-14 09:03:14.000000000 -0500 +++ karmapools/admin/includes/admin.globals.php 2004-09-14 14:30:52.681499552 -0500 @@ -14,8 +14,11 @@ define(DBP,"webuser"); // action strings +define(ADD_USER_QS,"au"); define(CREATE_POOL_QS,"cp"); -define(DEL_USER_QS,"du"); +define(DELETE_USER_QS,"du"); +define(EDIT_USER_QS,"eu"); +define(FLIP_AUDIT_QS,"fa"); define(LIST_POOL_QS,"lp"); define(LIST_USER_QS,"lu"); define(VIEW_USER_QS,"vu"); 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-14 09:03:21.000000000 -0500 +++ karmapools/admin/includes/admin.html.functions.php 2004-09-14 14:41:33.709048552 -0500 @@ -11,21 +11,41 @@ *****************************************************************************/ function displaySearchUserList($echo=true,$order='',$search='',$field='') { -$html = "
\n"; -$html .= "\n"; +$abc = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O', + 'P','Q','R','S','T','U','V','W','X','Y','Z'); +$a = LIST_USER_QS; +$qs = "./?a=$a"; +$html = " + + + + +
+ All "; +foreach($abc as $letter) { + $sqs = $qs . "&f=un&q=$letter%"; + $html .= " $letter "; + } + +$html .= " + + + \n"; if (isset($order) and !empty($order)) { - $html .= "\n"; + $html .= " \n"; } $html .= "Search " . selectUserListField(false,$field) . " "; $html .= " For: "; if (isset($search) and !empty($search)) { - $html .= "\n"; + $html .= "\n"; } else { - $html .= ""; + $html .= "\n"; } -$html .= "\n"; +$html .= " + +
\n"; if ($echo) { echo $html; } else { return $html; } @@ -60,18 +80,39 @@ $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"; + $edit_user_qs = "./?a=" . EDIT_USER_QS . "&uid=$uid"; + $edit_user_href = ""; + $edit_user_href .= ""; + $del_user_qs = "./?a=" . DELETE_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"; + $del_user_href .= ""; + if ($au > 0) { + $flip_audit_qs = "./?a=" . FLIP_AUDIT_QS . "&audit=on"; + $flip_audit_img = ""; + } else { + $flip_audit_qs = "./?a=" . FLIP_AUDIT_QS . "&audit=off"; + $flip_audit_img = ""; + } + $flip_audit_href = ""; + $flip_audit_href .= "$flip_audit_img"; + $html .= " + $view_user_href + $ue + $ip + $ua + $ul + $flip_audit_href + + $edit_user_href + + + $del_user_href + + \n"; } if ($echo) { echo $html; } else { return $html; } @@ -85,13 +126,12 @@ $qs = ''; if (isset($search) and !empty($search)) { - $qs .= "&q=" . urlencode($search); + $qs .= "&q=" . $search; } if (isset($field) and !empty($field)) { - $qs .= "&f=" . urlencode($field); + $qs .= "&f=" . $field; } - $text = "Userid"; $o_email = $text . "ue\">Email"; @@ -100,6 +140,11 @@ $o_access = $text . "ul\">Access"; $o_audit = $text . "au\">Audit"; +$add_qs = "./?a=" . ADD_USER_QS; +$add_img = INCPREFIX . "images/add16.png"; +$add_href = ""; + $html = " $o_userid $o_email @@ -108,6 +153,7 @@ $o_access $o_audit   + $add_href \n"; if ($echo) { echo $html; } else { return $html; } @@ -117,33 +163,34 @@ /***************************************************************************** * * *****************************************************************************/ -function displayUserListIndex($echo=true,$page='',$hits='',$field='', - $txt='') { +function displayUserListIndex($echo=true,$page='',$hits='',$order='', + $field='',$txt='') { if ($page == '' or $hits == '' ) { return false; } - $num_pages = ceil($hits / MAX_ROWS); + +$html = "(Total Hits: $hits) Page $page of "; +$html .= "$num_pages  "; + if ($num_pages < 2) { - $html = " "; if ($echo) { echo $html; return true; } else { return $html; } } if ( ! $txt == '') { - $qt = urlencode($txt); + $qt = $txt; $search = true; } else { $search = false; } -if ( $field !== '') { $field = urlencode($field); } - $prev_page = $page - 1; $next_page = $page + 1; -$html = "Page $page of $num_pages  "; +$beg_qs = "./?a=" . LIST_USER_QS; +if ($order) { $beg_qs .= "&o=$order"; } +if ($search) { $beg_qs .= "&q=" . $qt; } +if ($field) { $beg_qs .= "&f=" . $field; } if ($prev_page > 0) { - $p_url = "./?a=" . LIST_USER_QS . "&p=$prev_page"; - if ($search) { $p_url .= "&q=$qt"; } - if ($field) { $p_url .= "&f=$field"; } + $p_url = $beg_qs . "&p=$prev_page"; $prev_url = ""; $prev_url .= "< "; } else { @@ -151,9 +198,7 @@ } if ($next_page <= $num_pages) { - $n_url = "./?a=" . LIST_USER_QS . "&p=$next_page"; - if ($search) { $n_url .= "&q=$qt"; } - if ($field) { $n_url .= "&f=$field"; } + $n_url = $beg_qs . "&p=$next_page"; $next_url = "> "; } else { $next_url = "> "; @@ -175,11 +220,8 @@ if ($max_forw > $num_pages) { $max_forw = $num_pages; } // pad numbers so they don't jump around on the page list $max_len = strlen($num_pages); - for ($j=$max_back; $j <= $max_forw; $j++ ) { - $nurl = "./?a=" . LIST_USER_QS . "&p=$j"; - if ($search) { $nurl .= "&q=$qt"; } - if ($field) { $nurl .= "&f=$field"; } + $nurl = $beg_qs . "&p=$j"; $num_text = str_pad("$j",$max_len,"0",STR_PAD_LEFT); if ("$j" !== "$page") { $html .= ""; @@ -188,7 +230,6 @@ $html .= "$num_text "; } } - $html .= $next_url; if ($echo) { echo $html; } else { return $html; } diff -u -r -N karmapools.orig/admin/index.php karmapools/admin/index.php --- karmapools.orig/admin/index.php 2004-09-13 16:49:39.000000000 -0500 +++ karmapools/admin/index.php 2004-09-14 14:36:09.321362976 -0500 @@ -16,6 +16,10 @@ // Take action if called for switch ("$a") { + // add user + case ADD_USER_QS: + die("Ain't done yet!"); + break; // create pool case CREATE_POOL_QS: if ($_POST['confirm']) { @@ -26,6 +30,19 @@ die(include("./create.pool.php")); } break; + // delete user + case DELETE_USER_QS: + die("Ain't done yet!"); + break; + // edit user + case EDIT_USER_QS: + die("Ain't done yet!"); + break; + // flip audit status + case FLIP_AUDIT_QS: + die("Ain't done yet!"); + break; + // list users case LIST_USER_QS: die(include("./user.list.php")); break; diff -u -r -N karmapools.orig/admin/user.list.php karmapools/admin/user.list.php --- karmapools.orig/admin/user.list.php 2004-09-14 09:03:21.000000000 -0500 +++ karmapools/admin/user.list.php 2004-09-14 13:04:08.821606504 -0500 @@ -5,7 +5,7 @@ * Created 2004-09-09 Mike Green * *****************************************************************************/ if (basename($PHP_SELF) == basename(__FILE__)) { die("Access Denied"); } -$cols = 7; +$cols = 8; $title = DEFAULT_SITE_TITLE . "::Admin Menu::List Users"; $back_img = ""; $back_href = "$back_img"; @@ -32,21 +32,19 @@ - - + + MAX_ROWS) { ?> - + - diff -u -r -N karmapools.orig/docs/ChangeLog karmapools/docs/ChangeLog --- karmapools.orig/docs/ChangeLog 2004-09-14 09:03:21.000000000 -0500 +++ karmapools/docs/ChangeLog 2004-09-14 14:51:04.826225544 -0500 @@ -2,9 +2,24 @@ # Copyright (c)2004 badpenguins.com; Distributed under the GPL v2 # +*karmapools-0.0.5 (14 Sep 2004) + *karmapools-0.0.4 (13 Sep 2004) 14 Sep 2004; Mike Green docs/ChangeLog, + admin/includes/admin.apps.functions.php,admin/includes/admin.globals.php, + admin/includes/admin.html.functions.php,admin/index.php,admin/user.list.php, + images/add.gif,images/add16.png,images/edit16.png,images/off16.png, + images/on16.png,images/query16.png,images/trash16.png,style.css, + patch-0.0.4-05: + + Various fixes to pagination, added quick search links, added images for user + listing, added images and link to flip audit status, added image and link + for delete user, added image and link for edit user, added image and link + for add user. Fixed various bugs in searching. Update ChangeLog, bumped + version to 0.0.5. + + 14 Sep 2004; Mike Green docs/ChangeLog, admin/includes/admin.app.functions.php, admin.html.functions.php, admin/user.list.php, docs/date_pools.sql, patch-0.0.4-04: Files karmapools.orig/images/add.gif and karmapools/images/add.gif differ Files karmapools.orig/images/add16.png and karmapools/images/add16.png differ Files karmapools.orig/images/edit16.png and karmapools/images/edit16.png differ Files karmapools.orig/images/off16.png and karmapools/images/off16.png differ Files karmapools.orig/images/on16.png and karmapools/images/on16.png differ Files karmapools.orig/images/query16.png and karmapools/images/query16.png differ Files karmapools.orig/images/trash16.png and karmapools/images/trash16.png differ diff -u -r -N karmapools.orig/style.css karmapools/style.css --- karmapools.orig/style.css 2004-09-13 17:04:22.000000000 -0500 +++ karmapools/style.css 2004-09-14 11:04:28.107241016 -0500 @@ -16,10 +16,10 @@ a.header:visited { color:#9a9a9a; } a.header:active { color:#9a9a9a; } a.header:hover { color:#ffffff; text-decoration:underline; } -a.info:link { color:#a5a464; } -a.info:visited { color:#a5a464; } -a.info:active { color:#a5a464; } -a.info:hover { color:#a5a464; text-decoration:underline; } +a.info:link { color:#a5a464; white-space:nowrap;} +a.info:visited { color:#a5a464; white-space:nowrap;} +a.info:active { color:#a5a464; white-space:nowrap;} +a.info:hover { color:#a5a464; white-space:nowrap;text-decoration:underline; } a.footer:link { color:#a5a464; font-size:11.5px; } a.footer:visited { color:#a5a464; font-size:11.5px; } a.footer:active { color:#a5a464; font-size:11.5px; } @@ -59,4 +59,5 @@ font-weight:normal; } td.col2 { background-color:#000000; font-size:10pt; font-weight:normal; } +.searchbox { white-space:nowrap;} -->