diff --git a/inc/admin_acl.php b/inc/admin_acl.php index c8ac5755dbc21d515a90dca2ebe88234fd6bd2b7..d07cf4550087ac5fa4c749873a0c339af4f33a91 100644 --- a/inc/admin_acl.php +++ b/inc/admin_acl.php @@ -58,13 +58,13 @@ function admin_acl_handler(){ * @todo can this be combined with auth_aclcheck to avoid duplicate code? * @author Frank Schubert <frank@schokilade.de> */ -function get_acl_config($ID){ +function get_acl_config($id){ global $AUTH_ACL; $acl_config=array(); // match exact name - $matches = preg_grep('/^'.$ID.'\s+.*/',$AUTH_ACL); + $matches = preg_grep('/^'.$id.'\s+.*/',$AUTH_ACL); if(count($matches)){ foreach($matches as $match){ $match = preg_replace('/#.*$/','',$match); //ignore comments @@ -76,8 +76,8 @@ function get_acl_config($ID){ $specific_found=array(); // match ns - if(($ID=getNS($ID)) !== false){ - $matches = preg_grep('/^'.$ID.':\*\s+.*/',$AUTH_ACL); + while(($id=getNS($id)) !== false){ + $matches = preg_grep('/^'.$id.':\*\s+.*/',$AUTH_ACL); if(count($matches)){ foreach($matches as $match){ $match = preg_replace('/#.*$/','',$match); //ignore comments