summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/auth.php6
-rw-r--r--inc/auth/plain.php3
2 files changed, 8 insertions, 1 deletions
diff --git a/inc/auth.php b/inc/auth.php
index 863bb3c49..fdf5d17f3 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -29,7 +29,11 @@
if($conf['useacl']){
auth_login($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r']);
//load ACL into a global array
- $AUTH_ACL = file(DOKU_INC.'conf/acl.auth.php');
+ if(is_readable(DOKU_INC.'conf/acl.auth.php')){
+ $AUTH_ACL = file(DOKU_INC.'conf/acl.auth.php');
+ }else{
+ $AUTH_ACL = array();
+ }
}
/**
diff --git a/inc/auth/plain.php b/inc/auth/plain.php
index eaa01b79d..039fb422d 100644
--- a/inc/auth/plain.php
+++ b/inc/auth/plain.php
@@ -93,6 +93,9 @@ function auth_createUser($user,$pass,$name,$mail){
*/
function auth_plain_loadUserData(){
$data = array();
+ if(!@file_exists(DOKU_INC.'conf/users.auth.php')){
+ return $data;
+ }
$lines = file(DOKU_INC.'conf/users.auth.php');
foreach($lines as $line){
$line = preg_replace('/#.*$/','',$line); //ignore comments