summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-10-06 11:11:50 +0200
committerAndreas Gohr <andi@splitbrain.org>2012-10-06 11:11:50 +0200
commit3094e817f9f8c3971ffa00a852a1acee8bbcfd4c (patch)
treec72c87e7cce7cd7e2448dbc95e08b220d254b6e3
parentd48e3de576477fd446f8e613d229deba484014bc (diff)
downloadrpg-3094e817f9f8c3971ffa00a852a1acee8bbcfd4c.tar.gz
rpg-3094e817f9f8c3971ffa00a852a1acee8bbcfd4c.tar.bz2
changed default auth to authplain
We need to decide how to handle the renaming of the auth classes. Should this be done automatically somehow? Or is an admin expected to fix this manually when updating?
-rw-r--r--conf/dokuwiki.php2
-rw-r--r--inc/auth.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index cbd42115d..f5524de6b 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -54,7 +54,7 @@ $conf['hidepages'] = ''; //Regexp for pages to be skipped from
/* Authentication Settings */
$conf['useacl'] = 0; //Use Access Control Lists to restrict access?
$conf['autopasswd'] = 1; //autogenerate passwords and email them to user
-$conf['authtype'] = 'plain'; //which authentication backend should be used
+$conf['authtype'] = 'authplain'; //which authentication backend should be used
$conf['passcrypt'] = 'smd5'; //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
$conf['defaultgroup']= 'user'; //Default groups new Users are added to
$conf['superuser'] = '!!not set!!'; //The admin can be user or @group or comma separated list user1,@group1,user2
diff --git a/inc/auth.php b/inc/auth.php
index 25b9e4632..3fe465cbb 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -54,7 +54,10 @@ function auth_setup() {
}
}
- if(!$auth) return false;
+ if(!$auth){
+ msg($lang['authtempfail'], -1);
+ return false;
+ }
if ($auth && $auth->success == false) {
// degrade to unauthenticated user