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

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Sep 28 11:44:41 CEST 2010


Author: lolando
Date: 2010-09-28 11:44:40 +0200 (Tue, 28 Sep 2010)
New Revision: 10747

Modified:
   trunk/src/www/admin/grouplist.php
Log:
Removed dead code

Modified: trunk/src/www/admin/grouplist.php
===================================================================
--- trunk/src/www/admin/grouplist.php	2010-09-28 09:30:17 UTC (rev 10746)
+++ trunk/src/www/admin/grouplist.php	2010-09-28 09:44:40 UTC (rev 10747)
@@ -28,7 +28,6 @@
 site_admin_header(array('title'=>_('Project List')));
 echo '<h1>' . _('Project List') . '</h1>';
 
-$form_pending = getStringFromRequest('form_pending');
 $sortorder = getStringFromRequest('sortorder');
 $group_name_search = getStringFromRequest('group_name_search');
 $status = getStringFromRequest('status');
@@ -51,24 +50,18 @@
 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,groups.is_public,status,license_name
 ORDER BY '.$sortorder,
-					array (strtolower ("$group_name_search%"),
-					       'P',
-					       $form_pending ? 1 : 0)) ;
+					array (strtolower ("$group_name_search%"))) ;
 	} 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
 WHERE 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)) ;
+				array (strtolower ("$group_name_search%"))) ;
 	}
 } else {
 	if (PFO_USE_RBAC) {
@@ -86,10 +79,8 @@
 		$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
-AND (status=$1 OR 1!=$2)',
-				     array ('P',
-					    $form_pending ? 1 : 0)) ;
+WHERE license_id=license',
+					 array ()) ;
 		if ($status) {
 			$qpa = db_construct_qpa ($qpa, ' AND status=$1', array ($status)) ;
 		}




More information about the Fusionforge-commits mailing list