is_allowed improvement (#166)

emreakay · Sep 20, 2016 · e9e1503 · e9e1503
1 parent f54cab0
commit e9e1503
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php
@@ -1612,17 +1612,14 @@ public function is_allowed($perm_par, $user_id=FALSE){
 		if( $query->num_rows() > 0){
 		    return TRUE;
 		} else {
-			if( $user_id===FALSE){
-				return $this->is_group_allowed($perm_id);
-			} else {
-				$g_allowed=FALSE;
-				foreach( $this->get_user_groups($user_id) as $group ){
-					if ( $this->is_group_allowed($perm_id, $group->id) ){
-						$g_allowed=TRUE;
-					}
+			$g_allowed=FALSE;
+			foreach( $this->get_user_groups($user_id) as $group ){
+				if ( $this->is_group_allowed($perm_id, $group->id) ){
+					$g_allowed=TRUE;
+					break;
 				}
-				return $g_allowed;
 			}
+			return $g_allowed;
 	    }
 	}