From b78bf706e2ab1d34498beea00b7ecfda11944eee Mon Sep 17 00:00:00 2001 From: romain Date: Mon, 30 Jan 2012 19:58:55 +0100 Subject: Added support for the %GROUP% wildcard. %GROUP% is the same as %USER% except it's done on each group a user is in. %USER% and %GROUP% cannot be mixed on an ACL line. --- conf/dokuwiki.php | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 conf/dokuwiki.php (limited to 'conf/dokuwiki.php') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php old mode 100644 new mode 100755 index 7a7e4bf1a..2beb65600 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -69,6 +69,8 @@ $conf['iexssprotect']= 1; // check for JavaScript and HTML in up /* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */ $conf['useacl'] = 0; //Use Access Control Lists to restrict access? +$conf['usewildcards'] = 1; //Use ACL wildcards +$conf['groupwildcards'] = 1; //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) -- cgit v1.2.3 From 8f50749b133eb2da6dc2d69adc4fb163ed9d41c2 Mon Sep 17 00:00:00 2001 From: Aorimn Date: Mon, 30 Jan 2012 20:08:23 +0100 Subject: Change default groupwildcards option to 0 not to change behavior of already installed wikis --- conf/dokuwiki.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/dokuwiki.php') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 2beb65600..2d6c1ce68 100755 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -69,8 +69,8 @@ $conf['iexssprotect']= 1; // check for JavaScript and HTML in up /* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */ $conf['useacl'] = 0; //Use Access Control Lists to restrict access? -$conf['usewildcards'] = 1; //Use ACL wildcards -$conf['groupwildcards'] = 1; //More specifically, use %GROUP% wildcard +$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) -- cgit v1.2.3