fix for #51 'is_allowed() bug '

emreakay · Jul 28, 2015 · 136ba68 · 136ba68
1 parent fa22a5e
commit 136ba68
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php
@@ -1472,13 +1472,20 @@ public function is_allowed($perm_par, $user_id=FALSE){
 		$query = $this->aauth_db->get( $this->config_vars['perm_to_user'] );
 
 		if( $query->num_rows() > 0){
-			return TRUE;
-		} elseif ($this->is_group_allowed($perm_id)) {
-			return TRUE;
+		    return TRUE;
 		} else {
-			return FALSE;
-		}
-
+			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;
+					}
+				}
+				return $g_allowed;
+			}
+	    }
 	}
 
 	/**