[evolvis-commits] r15955: Restrict one use of user_group to non-PFO-RBAC
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 00:41:21 CET 2011
Author: mirabilos
Date: 2011-03-01 00:41:21 +0100 (Tue, 01 Mar 2011)
New Revision: 15955
Modified:
trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php
Log:
Restrict one use of user_group to non-PFO-RBAC
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php 2011-02-28 23:41:18 UTC (rev 15954)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php 2011-02-28 23:41:21 UTC (rev 15955)
@@ -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 evolvis-commits
mailing list