diff options
| author | chris <chris@jalakai.co.uk> | 2006-08-04 16:22:43 +0200 |
|---|---|---|
| committer | chris <chris@jalakai.co.uk> | 2006-08-04 16:22:43 +0200 |
| commit | 03c4aec3c817c51eda2cf5c241f76e3bef585799 (patch) | |
| tree | df6e92a9b73f0ff360fc3c44c0e0c8426809ee97 /inc/auth.php | |
| parent | ac900efc10a9139823163ed90870a7595d726f9f (diff) | |
| download | rpg-03c4aec3c817c51eda2cf5c241f76e3bef585799.tar.gz rpg-03c4aec3c817c51eda2cf5c241f76e3bef585799.tar.bz2 | |
unittest fixes
darcs-hash:20060804142243-9b6ab-d208f7f1a67a9958fda05c519c8407ad5e733cea.gz
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/inc/auth.php b/inc/auth.php index 467f4b0cd..8043feb45 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -17,6 +17,8 @@ require_once(DOKU_INC.'inc/blowfish.php'); require_once(DOKU_INC.'inc/mail.php'); + global $auth; + // load the the backend auth functions and instantiate the auth object if (@file_exists(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php')) { require_once(DOKU_INC.'inc/auth/basic.class.php'); @@ -54,11 +56,15 @@ // do the login either by cookie or provided credentials if($conf['useacl']){ // if no credentials were given try to use HTTP auth (for SSO) - if(!$_REQUEST['u'] && !$_COOKIE[DOKU_COOKIE] && $_SERVER['PHP_AUTH_USER']){ + if(empty($_REQUEST['u']) && !$_COOKIE[DOKU_COOKIE] && $_SERVER['PHP_AUTH_USER']){ $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER']; $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW']; } + if (!isset($_REQUEST['u'])) $_REQUEST['u'] = ''; + if (!isset($_REQUEST['p'])) $_REQUEST['p'] = ''; + if (!isset($_REQUEST['r'])) $_REQUEST['r'] = ''; + // external trust mechanism in place? if(!is_null($auth) && $auth->canDo('external')){ $auth->trustExternal($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r']); |