diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-06-29 14:55:35 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-06-29 14:55:35 +0200 |
| commit | bca545e60204a29018cc5002a1280a01b64594d9 (patch) | |
| tree | a75a9d1529581c265cb2f428df01e9fa24504b98 /conf/dokuwiki.php | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| parent | 8f50749b133eb2da6dc2d69adc4fb163ed9d41c2 (diff) | |
| download | rpg-bca545e60204a29018cc5002a1280a01b64594d9.tar.gz rpg-bca545e60204a29018cc5002a1280a01b64594d9.tar.bz2 | |
Merge branch 'master' of git://github.com/Aorimn/dokuwiki into pull-request-76
* 'master' of git://github.com/Aorimn/dokuwiki:
Change default groupwildcards option to 0 not to change behavior of
Added support for the %GROUP% wildcard.
Conflicts:
inc/auth.php
Diffstat (limited to 'conf/dokuwiki.php')
| -rwxr-xr-x[-rw-r--r--] | conf/dokuwiki.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index cbd42115d..1eb6f5c5d 100644..100755 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -53,6 +53,8 @@ $conf['hidepages'] = ''; //Regexp for pages to be skipped from /* Authentication Settings */ $conf['useacl'] = 0; //Use Access Control Lists to restrict access? +$conf['usewildcards'] = 1; //Use ACL wildcard %USER% +$conf['groupwildcards'] = 0; //More specifically, use %GROUP% wildcard $conf['autopasswd'] = 1; //autogenerate passwords and email them to user $conf['authtype'] = 'plain'; //which authentication backend should be used $conf['passcrypt'] = 'smd5'; //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411) |