diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-06-27 14:43:56 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-06-27 14:44:30 +0200 |
| commit | c8f80b4e70ee1b73ecc08cac583d021979af9359 (patch) | |
| tree | 87a53380612c962b8b0f20123eda0ab6785bc22b /inc/auth.php | |
| parent | c5ef5f5975c46c88423b0a824f383173662eaba3 (diff) | |
| download | rpg-c8f80b4e70ee1b73ecc08cac583d021979af9359.tar.gz rpg-c8f80b4e70ee1b73ecc08cac583d021979af9359.tar.bz2 | |
Use config_cascade for ACLs and plain auth users FS#1677
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/auth.php b/inc/auth.php index 6a4108a7c..49bb2d4d9 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -35,6 +35,7 @@ function auth_setup(){ global $auth; global $AUTH_ACL; global $lang; + global $config_cascade; $AUTH_ACL = array(); if(!$conf['useacl']) return false; @@ -102,8 +103,8 @@ function auth_setup(){ } //load ACL into a global array XXX - if(is_readable(DOKU_CONF.'acl.auth.php')){ - $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); + if(is_readable($config_cascade['acl']['default'])){ + $AUTH_ACL = file($config_cascade['acl']['default']); //support user wildcard if(isset($_SERVER['REMOTE_USER'])){ $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL); |