summaryrefslogtreecommitdiff
path: root/inc/auth
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2007-12-03 21:15:32 +0100
committerAndreas Gohr <andi@splitbrain.org>2007-12-03 21:15:32 +0100
commitc179167850b6c44679deb9edd4a816243addb52d (patch)
treea78851d26a4a9eb0db24b96b1f3a7289f8a3724e /inc/auth
parent1b2abcf93c01d372fac2868ee6930c2326b7c914 (diff)
downloadrpg-c179167850b6c44679deb9edd4a816243addb52d.tar.gz
rpg-c179167850b6c44679deb9edd4a816243addb52d.tar.bz2
getUserData should really be implemented always... (FS#1272)
... but with this patch DokuWiki will not break completely when left out for trustExternal() auth backends darcs-hash:20071203201532-7ad00-72dbc2d16e4c8c09cca9558286164f4d858c19ce.gz
Diffstat (limited to 'inc/auth')
-rw-r--r--inc/auth/basic.class.php7
1 files changed, 5 insertions, 2 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;
}