--- docman.php	2001/12/14 17:28:06	1.49
+++ docman.php	2002/01/11 10:06:28	1.53
@@ -174,14 +174,29 @@
 <B><?= date($gblDateFmt) ?> -
 <?= date($gblTimeFmt) ?> -
 <?= $gblUserName ?>
-<small> [<a href="<?= $PHP_SELF ?>?relogin=<?= $gblPw ?>">logout</a>]</small>
+<?php
+	global $PHP_AUTH_USER,$PHP_AUTH_PW;
+	$url = $PHP_SELF."?relogin=";
+	if (isset($gblPw) && $gblPw != "") {
+		$url .= $gblPw;
+	} else {
+		$url .= md5($PHP_AUTH_USER.$PHP_AUTH_PW);
+	}
+	if (isset($PHP_AUTH_USER) && $PHP_AUTH_USER != "" && ($PHP_AUTH_PW == "" || !isset($PHP_AUTH_PW))) {
+		$url_title="login";
+		$url .= "&force_login=1";
+	} else {
+		$url_title="relogin";
+	}
+?>
+<small> [<a href="<?= $url ?>"><?= $url_title ?></a>]</small>
 </B>
 <BR><small>
 Document Manager <?= $gblVersion ?>, based on ANYPORTAL(php) Site Manager 
 <br>
 &copy; 1999 by <A HREF="http://www.anyportal.com">ANYPORTAL</A>,
 &copy; 2000 by <A HREF="http://da.nger.org">d@nger.org</A>,
-&copy; 2000 by <A HREF="http://www.rot13.org/~dpavlin/">DbP</A>
+&copy; 2000-2002 by <A HREF="http://www.rot13.org/~dpavlin/">DbP</A>
 </small>
 </P>
 <BR>
@@ -950,6 +965,8 @@
 
 	$title = "(401 Unauthorized)" ;
 	$text  = "No trespassing !" ;
+
+	global $PHP_AUTH_USER,$PHP_AUTH_PW,$gblPw,$relogin;
 	StartHTML($title,$text) ;
 
 	EndHTML() ;
@@ -1226,7 +1243,7 @@
 
 	// forks before authentication: style sheet and hash
 	// creation if password not yet set.
-	if ($STYLE == "get") { CSS() ; exit ; }
+	if (isset($STYLE) && $STYLE == "get") { CSS() ; exit ; }
 
 	$fsScriptDir  = dirname($SCRIPT_FILENAME) ; 	
 	// i.e. /home/httpd/html/docman
@@ -1243,10 +1260,26 @@
 		Error("Configuration error","Can't find user handling module at <tt>$gblIncDir/$gblUsers.php</tt> ! Please fix <tt>$fsScriptDir/.docman.conf</tt>");
 	}
 
+	// if no password, or empty password logout
+	if (
+		isset($PHP_AUTH_USER) && (
+			!isset($relogin) || (
+				isset($relogin) && $relogin != md5($PHP_AUTH_USER.$PHP_AUTH_PW)
+			)
+		) && (
+			$PHP_AUTH_PW == "" || !isset($PHP_AUTH_PW)
+		) && !isset($force_login)
+	   ) {
+		StartHTML("Logout completed","Your login credentials has been erased") ;
+		EndHTML() ;
+		exit ;
+	}
+
 	// authentication failure
 	if ( md5($PHP_AUTH_USER.$PHP_AUTH_PW) != $gblPw ||
-		isset($relogin) && $gblPw == $relogin ) {
-		header("WWW-authenticate: basic realm=\"$HTTP_HOST\"") ;
+		isset($relogin) && $gblPw == $relogin) {
+		$realm="$HTTP_HOST";
+		header("WWW-authenticate: basic realm=\"$realm\"") ;
 		header("HTTP/1.0 401 Unauthorized") ;
 		NoEntry() ;
 		exit ;