[Gforge-commits] gforge/www/admin grouplist.php,1.17,1.18

[gsmet]

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

Modified Files:
        grouplist.php 
Log Message:
fixed the grouplist page (license name and localized strings)

Index: grouplist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/grouplist.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- grouplist.php       8 Oct 2004 21:38:01 -0000       1.17
+++ grouplist.php       7 Dec 2004 16:15:11 -0000       1.18
@@ -33,47 +33,44 @@
        $form_catroot = 1;
 }
 
-//CB removed from 2.6 and 2.5 was link to a page saying to use new project
-//echo "<br /><a href=\"groupedit-add.php\">[Add Group]</a>";
-echo "<p>".$Language->getText('admin_grouplist','group_list_for_category');
-
 $sortorder = $_GET['sortorder'];
 if (!isset($sortorder) || empty($sortorder)) {
        $sortorder = "group_name";
 }
 if ($form_catroot == 1) {
        if (isset($group_name_search)) {
-               echo "<strong>" 
.$Language->getText('admin_grouplist','groups_that_begin_with'). 
"$group_name_search</strong>\n";
-               $res = db_query("SELECT 
group_name,register_time,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,register_time,unix_group_name,groups.group_id,is_public,status,license
 "
+               echo 
"<p>".$Language->getText('admin_grouplist','groups_that_begin_with'). " 
<strong>".$group_name_search."</strong></p>\n";
+               $res = db_query("SELECT 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name,COUNT(user_group.group_id)
 AS members "
+                       . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id, licenses WHERE license_id=license AND 
group_name ILIKE '$group_name_search%' "
+                       . "GROUP BY 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name
 "
                        . ($form_pending?"AND WHERE status='P' ":"")
                        . " ORDER BY $sortorder");
        } else {
-               echo "<strong>All Categories</strong>\n";
-               $res = db_query("SELECT 
group_name,register_time,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,register_time,unix_group_name,groups.group_id,is_public,status,license
 "
+               echo 
"<p>".$Language->getText('admin_grouplist','group_list_for_category').' ';
+               echo "<strong>".$Language->getText('admin_grouplist', 
'all_categories')."</strong></p>\n";
+               $res = db_query("SELECT 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name,
 COUNT(user_group.group_id) AS members "
+                       . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id, licenses "
+                       . "WHERE license_id=license "
+                       . ($status?"AND status='$status' ":"")
+                       . "GROUP BY 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name
 "
                        . "ORDER BY $sortorder");
        }
 } else {
-       echo "<strong>" . category_fullname($form_catroot) . "</strong>\n";
+       echo 
"<p>".$Language->getText('admin_grouplist','group_list_for_category').' ';
+       echo "<strong>" . category_fullname($form_catroot) . "</strong></p>\n";
        $res = db_query("SELECT 
groups.group_name,groups.register_time,groups.unix_group_name,groups.group_id,"
                . "groups.is_public,"
-               . "groups.license,"
+               . "licenses.license_name,"
                . "groups.status "
                . "COUNT(user_group.group_id) AS members "
-               . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id,group_category "
+               . "FROM groups LEFT JOIN user_group ON 
user_group.group_id=groups.group_id,group_category,licenses "
                . "WHERE groups.group_id=group_category.group_id AND "
-               . "group_category.category_id=".$GLOBALS['form_catroot']." "
-               . "GROUP BY 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license
 "
+               . "group_category.category_id=".$GLOBALS['form_catroot']." AND "
+               . "licenses.license_id=groups.license "
+               . "GROUP BY 
group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name
 "
                . "ORDER BY $sortorder");
 }
 
-?>
-</p>
-<?php
 $headers = array(
        $Language->getText('admin_grouplist','group_name_click_to_edit'),
        $Language->getText('admin_grouplist','register_time'),
@@ -90,7 +87,7 @@
        '?sortorder=unix_group_name',
        '?sortorder=status',
        '?sortorder=is_public',
-       '?sortorder=license',
+       '?sortorder=license_name',
        '?sortorder=members'
 );
 
@@ -108,7 +105,7 @@
        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['license_name'].'</td>';
        echo '<td>'.$grp['members'].'</td>';
        echo '</tr>';
        $i++;