[Fusionforge-commits] r10705 - trunk/src/www/admin

Roland Mas lolando at libremir.placard.fr.eu.org
Sat Sep 25 21:35:51 CEST 2010


Author: lolando
Date: 2010-09-25 21:35:51 +0200 (Sat, 25 Sep 2010)
New Revision: 10705

Modified:
   trunk/src/www/admin/grouplist.php
Log:
Restrict one use of user_group to non-PFO-RBAC

Modified: trunk/src/www/admin/grouplist.php
===================================================================
--- trunk/src/www/admin/grouplist.php	2010-09-25 19:25:39 UTC (rev 10704)
+++ trunk/src/www/admin/grouplist.php	2010-09-25 19:35:51 UTC (rev 10705)
@@ -44,6 +44,20 @@
 
 if (isset($group_name_search)) {
 	echo "<p>"._('Projects that begin with'). " <strong>".$group_name_search."</strong></p>\n";
+	if (PFO_USE_RBAC) {
+		$res = db_query_params ('SELECT group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id)) AS members
+FROM groups, pfo_user_role, pfo_role, licenses
+WHERE pfo_user_role.role_id=pfo_role.role_id
+AND pfo_role.home_group_id=groups.group_id
+AND license_id=license
+AND lower(group_name) LIKE $1
+AND (status=$2 OR 1!=$3)
+GROUP BY group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name
+ORDER BY '.$sortorder,
+					array (strtolower ("$group_name_search%"),
+					       'P',
+					       $form_pending ? 1 : 0)) ;
+	} else {
 	$res = db_query_params ('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
@@ -55,13 +69,20 @@
 				array (strtolower ("$group_name_search%"),
 				       'P',
 				       $form_pending ? 1 : 0)) ;
+	}
 } else {
-	$qpa = db_construct_qpa (false, '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') ;
-	if ($status) {
-		$qpa = db_construct_qpa ($qpa, ' AND status=$1', array ($status)) ;
+	if (PFO_USE_RBAC) {
+		$qpa = db_construct_qpa (false, 'SELECT group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id)) AS members
+FROM groups, pfo_user_role, pfo_role, licenses
+WHERE pfo_user_role.role_id=pfo_role.role_id
+AND pfo_role.home_group_id=groups.group_id
+AND license_id=license') ;
+		if ($status) {
+			$qpa = db_construct_qpa ($qpa, ' AND status=$1', array ($status)) ;
+		}
+		$qpa = db_construct_qpa ($qpa, ' GROUP BY group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name ORDER BY '.$sortorder) ;
+		$res = db_query_qpa ($qpa) ;
 	}
-	$qpa = db_construct_qpa ($qpa, ' GROUP BY group_name,register_time,unix_group_name,groups.group_id,is_public,status,license_name ORDER BY '.$sortorder) ;
-	$res = db_query_qpa ($qpa) ;
 }
 
 $headers = array(




More information about the Fusionforge-commits mailing list