[Fusionforge-commits] r15677 - in branches/Branch_5_2: . src/plugins/scmsvn/common

Roland Mas lolando at fusionforge.org
Thu Jun 7 10:01:38 CEST 2012


Author: lolando
Date: 2012-06-07 10:01:37 +0200 (Thu, 07 Jun 2012)
New Revision: 15677

Modified:
   branches/Branch_5_2/
   branches/Branch_5_2/src/plugins/scmsvn/common/SVNPlugin.class.php
Log:
Fix generation of SVN auth file using RBAC API for bug [#446]

Modified: branches/Branch_5_2/src/plugins/scmsvn/common/SVNPlugin.class.php
===================================================================
--- branches/Branch_5_2/src/plugins/scmsvn/common/SVNPlugin.class.php	2012-06-06 16:42:33 UTC (rev 15676)
+++ branches/Branch_5_2/src/plugins/scmsvn/common/SVNPlugin.class.php	2012-06-07 08:01:37 UTC (rev 15677)
@@ -289,6 +289,7 @@
 
 		$access_data = '';
 		$password_data = '';
+		$engine = RBACEngine::getInstance() ;
 
 		$svnusers = array();
 		foreach ($groups as $project) {
@@ -300,20 +301,16 @@
 			}
 			$access_data .= '[' . $project->getUnixName() . ":/]\n";
 
-			$users = $project->getMembers();
+			$users = $engine->getUsersByAllowedAction('scm',$project->getID(),'read');
 			foreach ($users as $user) {
+				$svnusers[$user->getID()] = $user;
 				if (forge_check_perm_for_user($user,
 							       'scm',
 							       $project->getID(),
 							       'write')) {
 					$access_data .= $user->getUnixName() . "= rw\n";
-					$svnusers[$user->getID()] = $user;
-				} elseif (forge_check_perm_for_user($user,
-								     'scm',
-								     $project->getID(),
-								     'read')) {
+				} else {
 					$access_data .= $user->getUnixName() . "= r\n";
-					$svnusers[$user->getID()] = $user;
 				}
 			}
 




More information about the Fusionforge-commits mailing list