[Gforge-commits] gforge/www/admin index.php, 1.17, 1.18 grouplist.php, 1.13, 1.14 userlist.php, 1.12, 1.13

[gsmet]

Update of /cvsroot/gforge/gforge/www/admin
In directory db.perdue.net:/tmp/cvs-serv6756/www/admin

Modified Files:
        index.php grouplist.php userlist.php 
Log Message:
- redesigned group list table
- display users beginning with and display groups beginning with are now 
working correctly


Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- index.php   18 Feb 2004 09:18:25 -0000      1.17
+++ index.php   9 Mar 2004 15:39:52 -0000       1.18
@@ -36,10 +36,10 @@
 </ul>
 <ul>
        <li><a href="userlist.php"><?php echo 
$Language->getText('admin_index','display_full_user_list'); 
?></a>&nbsp;&nbsp;</li>
-       <li><?php echo 
$Language->getText('admin_index','display_user_beginning_with') ?>
-<?php
+       <li><?php
+       echo $Language->getText('admin_index','display_user_beginning_with').' 
';
        for ($i=0; $i < count($abc_array); $i++) {
-               echo "<a 
href=\"search.php?usersearch=1&amp;search=$abc_array[$i]%\">$abc_array[$i]</a>|";
+               echo '<a 
href="userlist.php?user_name_search='.$abc_array[$i].'">'.$abc_array[$i].'</a>|';
        }
 ?>
        <br />
@@ -75,10 +75,11 @@
 <ul>
        <li><a href="grouplist.php"><?php echo 
$Language->getText('admin_index','display_full_group'); ?></a></li>
 
-       <li><?php echo 
$Language->getText('admin_index','display_groups_beginning_with'); ?>
-<?php
+       <li>
+       <?php
+       echo 
$Language->getText('admin_index','display_groups_beginning_with').' ';
        for ($i=0; $i < count($abc_array); $i++) {
-               echo "<a 
href=\"search.php?groupsearch=1&amp;search=$abc_array[$i]%\">$abc_array[$i]</a>|";
+               echo '<a 
href="grouplist.php?group_name_search='.$abc_array[$i].'">'.$abc_array[$i].'</a>|';
        }
 ?>
        <br />
@@ -158,4 +159,4 @@
 
 site_admin_footer(array());
 
-?>
\ No newline at end of file
+?>

Index: grouplist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/grouplist.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- grouplist.php       18 Feb 2004 09:18:25 -0000      1.13
+++ grouplist.php       9 Mar 2004 15:39:52 -0000       1.14
@@ -19,94 +19,83 @@
 }
 
 //CB removed from 2.6 and 2.5 was link to a page saying to use new project
-//print "<br /><a href=\"groupedit-add.php\">[Add Group]</a>";
-print 
"<p>".$GLOBALS['system_name'].$Language->getText('admin_grouplist','group_list_for_category');
+//echo "<br /><a href=\"groupedit-add.php\">[Add Group]</a>";
+echo 
"<p>".$GLOBALS['system_name'].$Language->getText('admin_grouplist','group_list_for_category');
 
 $sortorder = $_GET['sortorder'];
-if ($sortorder == null) {
+if (!isset($sortorder) || empty($sortorder)) {
        $sortorder = "group_name";
 }
 if ($form_catroot == 1) {
-
        if (isset($group_name_search)) {
-               print "<strong>" 
.$Language->getText('admin_grouplist','groups_that_begin_with'). 
"$group_name_search</strong>\n";
-               $res = db_query("SELECT 
group_name,unix_group_name,group_id,is_public,status,license "
-                       . "FROM groups WHERE group_name ~* 
'^$group_name_search%' "
+               echo "<strong>" 
.$Language->getText('admin_grouplist','groups_that_begin_with'). 
"$group_name_search</strong>\n";
+               $res = db_query("SELECT 
group_name,unix_group_name,groups.group_id,is_public,status,license,COUNT(user_group.group_id)
 AS members "
+                       . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id WHERE group_name ILIKE 
'$group_name_search%' "
+                       . "GROUP BY 
group_name,unix_group_name,groups.group_id,is_public,status,license "
                        . ($form_pending?"AND WHERE status='P' ":"")
-                       . " ORDER BY group_name");
+                       . " ORDER BY $sortorder");
        } else {
-               print "<strong>All Categories</strong>\n";
-               $res = db_query("SELECT 
group_name,unix_group_name,group_id,is_public,status,license "
-                       . "FROM groups "
+               echo "<strong>All Categories</strong>\n";
+               $res = db_query("SELECT 
group_name,unix_group_name,groups.group_id,is_public,status,license, 
COUNT(user_group.group_id) AS members "
+                       . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id "
                        . ($status?"WHERE status='$status' ":"")
+                       . "GROUP BY 
group_name,unix_group_name,groups.group_id,is_public,status,license "
                        . "ORDER BY $sortorder");
        }
 } else {
-       print "<strong>" . category_fullname($form_catroot) . "</strong>\n";
+       echo "<strong>" . category_fullname($form_catroot) . "</strong>\n";
 
        $res = db_query("SELECT 
groups.group_name,groups.unix_group_name,groups.group_id,"
                . "groups.is_public,"
                . "groups.license,"
                . "groups.status "
-               . "FROM groups,group_category "
+               . "COUNT(user_group.group_id) AS members "
+               . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id,group_category "
                . "WHERE groups.group_id=group_category.group_id AND "
                . "group_category.category_id=$GLOBALS[form_catroot] "
+               . "GROUP BY 
group_name,unix_group_name,groups.group_id,is_public,status,license "
                . "ORDER BY $sortorder");
 }
+
 ?>
 </p>
-<table width="100%" border="1">
-<tr>
-<td><strong>
-<a href="?sortorder=group_name">
-<?php echo $Language->getText('admin_grouplist','group_name_click_to_edit'); ?>
-</a>
-</strong></td>
-<td><strong>
-<a href="?sortorder=unix_group_name">
-<?php echo $Language->getText('admin_grouplist','unix_name'); ?>
-</a>
-</strong></td>
-<td><strong>
-<a href="?sortorder=status">
-<?php echo $Language->getText('admin_grouplist','status'); ?>
-</a>
-</strong></td>
-<td><strong>
-<a href="?sortorder=is_public">
-<?php echo $Language->getText('admin_grouplist','public'); ?>
-</a>
-</strong></td>
-<td><strong>
-<a href="?sortorder=license">
-<?php echo $Language->getText('admin_grouplist','license'); ?>
-</a>
-</strong></td>
-<td><strong>
-<?php echo $Language->getText('admin_grouplist','members'); ?>
-</strong></td>
-</tr>
-
 <?php
-while ($grp = db_fetch_array($res)) {
-       print "<tr>";
-       print "<td><a 
href=\"groupedit.php?group_id=$grp[group_id]\">$grp[group_name]</a></td>";
-       print "<td>$grp[unix_group_name]</td>";
-       print "<td>$grp[status]</td>";
-       print "<td>$grp[is_public]</td>";
-       print "<td>$grp[license]</td>";
+$headers = array(
+       $Language->getText('admin_grouplist','group_name_click_to_edit'),
+       $Language->getText('admin_grouplist','unix_name'),
+       $Language->getText('admin_grouplist','status'),
+       $Language->getText('admin_grouplist','public'),
+       $Language->getText('admin_grouplist','license'),
+       $Language->getText('admin_grouplist','members')
+);
 
-       // members
-       $res_count = db_query("SELECT user_id FROM user_group WHERE 
group_id=$grp[group_id]");
-       print "<td>" . db_numrows($res_count) . "</td>";
+$headerLinks = array(
+       '?sortorder=group_name',
+       '?sortorder=unix_group_name',
+       '?sortorder=status',
+       '?sortorder=is_public',
+       '?sortorder=license',
+       '?sortorder=members'
+);
 
-       print "</tr>\n";
+echo $HTML->listTableTop($headers, $headerLinks);
+
+$i = 0;
+
+while ($grp = db_fetch_array($res)) {
+       echo '<tr '.$HTML->boxGetAltRowStyle($i).'>';
+       echo '<td><a 
href="groupedit.php?group_id='.$grp['group_id'].'">'.$grp['group_name'].'</a></td>';
+       echo '<td>'.$grp['unix_group_name'].'</td>';
+       echo '<td>'.$grp['status'].'</td>';
+       echo '<td>'.$grp['is_public'].'</td>';
+       echo '<td>'.$grp['license'].'</td>';
+       echo '<td>'.$grp['members'].'</td>';
+       echo '</tr>';
+       $i++;
 }
-?>
 
-</table>
+echo $HTML->listTableBottom();
 
-<?php
 site_admin_footer(array());
 
 ?>

Index: userlist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/userlist.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- userlist.php        18 Feb 2004 09:18:25 -0000      1.12
+++ userlist.php        9 Mar 2004 15:39:52 -0000       1.13
@@ -95,9 +95,7 @@
        print "\n</p>";
 
        if ($user_name_search) {
-         // [RM] LIKE is case-sensitive, and we don't want that
-         //            $result = db_query("SELECT user_name,user_id,status 
FROM users WHERE user_name LIKE '$user_name_search%' ORDER BY user_name");
-               $result = db_query("SELECT user_name,user_id,status,add_date 
FROM users WHERE user_name ~* '^$user_name_search' ORDER BY user_name");
+               $result = db_query("SELECT user_name,user_id,status,add_date 
FROM users WHERE user_name ILIKE '".$user_name_search."%' OR realname ILIKE 
'".$user_name_search."%' OR realname ILIKE '% ".$user_name_search."%' ORDER BY 
user_name");
        } else {
                $result = db_query("SELECT user_name,user_id,status,add_date 
FROM users ORDER BY user_name");
        }