[evolvis-commits] r15179: RBAC: adapted Role::getVal()

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:48:09 CET 2011


Author: mirabilos
Date: 2011-02-28 23:48:09 +0100 (Mon, 28 Feb 2011)
New Revision: 15179

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

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class.php	2011-02-28 22:48:06 UTC (rev 15178)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Role.class.php	2011-02-28 22:48:09 UTC (rev 15179)
@@ -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 evolvis-commits mailing list