diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/auth/basic.class.php | 7 | ||||
| -rw-r--r-- | inc/common.php | 1 | ||||
| -rw-r--r-- | inc/infoutils.php | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/inc/auth/basic.class.php b/inc/auth/basic.class.php index 077b92d62..bf251bae0 100644 --- a/inc/auth/basic.class.php +++ b/inc/auth/basic.class.php @@ -109,7 +109,8 @@ class auth_basic { * If this function is implemented it will be used to * authenticate a user - all other DokuWiki internals * will not be used for authenticating, thus - * implementing the functions below becomes optional. + * implementing the checkPass() function is not needed + * anymore. * * The function can be used to authenticate against third * party cookies or Apache auth mechanisms and replaces @@ -159,6 +160,8 @@ class auth_basic { * Checks if the given user exists and the given * plaintext password is correct * + * May be ommited if trustExternal is used. + * * @author Andreas Gohr <andi@splitbrain.org> * @return bool */ @@ -181,7 +184,7 @@ class auth_basic { * @return array containing user data or false */ function getUserData($user) { - msg("no valid authorisation system in use", -1); + if(!$this->cando['external']) msg("no valid authorisation system in use", -1); return false; } diff --git a/inc/common.php b/inc/common.php index 96980e7ee..ec500d906 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1061,6 +1061,7 @@ function subscriber_addresslist($id){ foreach ($mlist as $who) { $who = rtrim($who); $info = $auth->getUserData($who); + if($info === false) continue; $level = auth_aclcheck($id,$who,$info['grps']); if ($level >= AUTH_READ) { if (strcasecmp($info['mail'],$conf['notify']) != 0) { diff --git a/inc/infoutils.php b/inc/infoutils.php index f08acb318..c9e553ba7 100644 --- a/inc/infoutils.php +++ b/inc/infoutils.php @@ -165,11 +165,8 @@ function check(){ } if($INFO['userinfo']['name']){ - global $auth; - msg('You are currently logged in as '.$_SESSION[DOKU_COOKIE]['auth']['user'].' ('.$INFO['userinfo']['name'].')',0); - - if($auth) $info = $auth->getUserData($_SESSION[DOKU_COOKIE]['auth']['user']); - msg('You are part of the groups '.implode($info['grps'],', '),0); + msg('You are currently logged in as '.$_SERVER['REMOTE_USER'].' ('.$INFO['userinfo']['name'].')',0); + msg('You are part of the groups '.join($INFO['userinfo']['grps'],', '),0); }else{ msg('You are currently not logged in',0); } |