[Fusionforge-commits] r9858 - trunk/gforge/common/include

Roland Mas lolando at libremir.placard.fr.eu.org
Fri May 21 10:01:24 CEST 2010


Author: lolando
Date: 2010-05-21 10:01:24 +0200 (Fri, 21 May 2010)
New Revision: 9858

Modified:
   trunk/gforge/common/include/Role.class.php
Log:
RBAC: adapted Role::getVal()

Modified: trunk/gforge/common/include/Role.class.php
===================================================================
--- trunk/gforge/common/include/Role.class.php	2010-05-21 08:01:12 UTC (rev 9857)
+++ trunk/gforge/common/include/Role.class.php	2010-05-21 08:01:24 UTC (rev 9858)
@@ -687,10 +687,18 @@
 		if (!$ref_id) {
 			$ref_id=0;
 		}
-		if (array_key_exists ($section, $this->setting_array)) {
-			return $this->setting_array[$section][$ref_id];
+		if (USE_PFO_RBAC) {
+			if (array_key_exists ($section, $this->perms_array)) {
+				return $this->perms_array[$section][$ref_id];
+			} else {
+				return 0 ;
+			}
 		} else {
-			return 0 ;
+			if (array_key_exists ($section, $this->setting_array)) {
+				return $this->setting_array[$section][$ref_id];
+			} else {
+				return 0 ;
+			}
 		}
 	}
 




More information about the Fusionforge-commits mailing list