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

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


Author: lolando
Date: 2010-09-25 21:24:05 +0200 (Sat, 25 Sep 2010)
New Revision: 10703

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

Modified: trunk/src/www/admin/approve-pending.php
===================================================================
--- trunk/src/www/admin/approve-pending.php	2010-09-25 19:00:35 UTC (rev 10702)
+++ trunk/src/www/admin/approve-pending.php	2010-09-25 19:24:05 UTC (rev 10703)
@@ -213,6 +213,15 @@
 		print "<p>" ._('Pending reason:'). "</p><span class=\"important\">".$row_grp['status_comment']."</span>";
 	}
 
+	if (USE_PFO_RBAC) {
+		$submitter = NULL ;
+		foreach (get_group_join_requests ($this) as $gjr) {
+			$submitter = user_get_object($gjr->getUserID()) ;
+			echo '<p>'
+				.sprintf(_('Submitted by %1$s (%2$s)'), $submitter->getRealName(), $submitter->getUnixName())
+				.'</p>' ;
+		}
+	} else {
 	$res = db_query_params("SELECT u.user_id
 			 FROM users u, user_group ug
 			 WHERE ug.group_id=$1 AND u.user_id=ug.user_id;", array($row_grp['group_id']));
@@ -224,6 +233,7 @@
 			.sprintf(_('Submitted by %1$s (%2$s)'), $submitter->getRealName(), $submitter->getUnixName())
 			.'</p>' ;
 	}
+	}
 	
 	echo "<hr />";
 }




More information about the Fusionforge-commits mailing list