[evolvis-commits] r15144: RBAC migration: project admin pages

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:46:33 CET 2011


Author: mirabilos
Date: 2011-02-28 23:46:33 +0100 (Mon, 28 Feb 2011)
New Revision: 15144

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/users.php
Log:
RBAC migration: project admin pages

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php	2011-02-28 22:46:31 UTC (rev 15143)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/index.php	2011-02-28 22:46:33 UTC (rev 15144)
@@ -44,17 +44,6 @@
 	exit_error('Error',$group->getErrorMessage());
 }
 
-$perm =& $group->getPermission ();
-if (!$perm || !is_object($perm)) {
-	exit_error('Error','Could Not Get Permission');
-} elseif ($perm->isError()) {
-	exit_error('Error',$perm->getErrorMessage());
-}
-
-if (!$perm->isAdmin()) {
-	exit_permission_denied();
-}
-
 $group->clearError();
 
 $adminheadertitle=sprintf(_('Project Admin: %1$s'), $group->getPublicName() );

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php	2011-02-28 22:46:31 UTC (rev 15143)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/project_admin_utils.php	2011-02-28 22:46:33 UTC (rev 15144)
@@ -36,23 +36,13 @@
 	$params['toptab']='admin';
 	$params['group']=$group_id;
 
+	session_require_perm ('project_admin', $group_id) ;
+
 	$project =& group_get_object($group_id);
 	if (!$project || !is_object($project)) {
 		return;
 	}
 
-	$perm =& $project->getPermission ();
-	if (!$perm || !is_object($perm)) {
-		return;
-	}
-
-	/*
-		Enforce Project Admin Perms
-	*/
-	if (!$perm->isAdmin()) {
-		exit_permission_denied();
-	}
-
 	site_project_header($params);
 	
 	$labels = array();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/users.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/users.php	2011-02-28 22:46:31 UTC (rev 15143)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/users.php	2011-02-28 22:46:33 UTC (rev 15144)
@@ -47,17 +47,6 @@
 	exit_error('Error',$group->getErrorMessage());
 }
 
-$perm =& $group->getPermission ();
-if (!$perm || !is_object($perm)) {
-	exit_error('Error','Could Not Get Permission');
-} elseif ($perm->isError()) {
-	exit_error('Error',$perm->getErrorMessage());
-}
-
-if (!$perm->isAdmin()) {
-	exit_permission_denied();
-}
-
 // Add hook to replace users managements by a plugin.
 $html_code = array();
 if (plugin_hook_listeners("project_admin_users") > 0) {



More information about the evolvis-commits mailing list