--- docman.php	2001/12/14 16:58:27	1.48
+++ docman.php	2002/01/24 09:09:12	1.56
@@ -133,7 +133,7 @@
 
 //////////////////////////////////////////////////////////////////
 
-	$gblVersion = "1.8-dev";
+	$gblVersion = "1.9-dev";
 
 function StartHTML($title,$text="") {
 
@@ -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>
@@ -701,7 +716,7 @@
 		CELLSPACING=3 WIDTH=\"100%\">" ;
 
 	// updir bar	
-	if ($fsDir != $fsRoot) {
+	if (chopsl($fsDir) != chopsl($fsRoot)) {
 		$parent = dirname($relDir) ;
 		if ($parent == "") $parent = "/" ;
 ?>
@@ -950,6 +965,8 @@
 
 	$title = "(401 Unauthorized)" ;
 	$text  = "No trespassing !" ;
+
+	global $PHP_AUTH_USER,$PHP_AUTH_PW,$gblPw,$relogin;
 	StartHTML($title,$text) ;
 
 	EndHTML() ;
@@ -1158,7 +1175,6 @@
 	$log=fopen("$gblFsRoot/.changelog","r");
 	$logarr = array();
 	while($line = fgetcsv($log,512,"\t")) {
-		$line[0] .= sizeof($line);
 		while (sizeof($line) > 4) {
 			$tmp = array_pop($line);
 			$line.=" $tmp";
@@ -1205,6 +1221,13 @@
 
 //////////////////////////////////////////////////////////////////
 
+function chopsl($path) {
+	if (substr($path,strlen($path)-1,1) == "/") $path=substr($path,0,strlen($path)-1);
+	$path=str_replace("//","/",$path);
+	return $path;
+}
+
+//////////////////////////////////////////////////////////////////
 // MAIN PROGRAM
 // ============
 // query parameters: capital letters
@@ -1219,7 +1242,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
@@ -1236,10 +1259,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 ;
@@ -1462,6 +1501,7 @@
 	// $A=Co : checkout file $D/$F
 	// $A=Ci : checkin file $D/$F
 	// $A=V : view file (do nothing except log)
+	// $A=I : include file .$F.php from $gblFsRoot
 	// default : display directory $D
 
 	switch ($A) {
@@ -1521,6 +1561,19 @@
 		DisplayChangeLog(1);
 		EndHTML() ;
 		exit;
+	case "I" :
+		$F=stripSlashes($F);
+		$inc_file="${gblFsRoot}/.${F}.php";
+		if (!isset($F) || $F == "" || !file_exists($inc_file)) Error("Fatal error $inc_file"); // can't find file to include
+		if (!is_readable($inc_file))
+			Error("Read access to include file denied",".${F}.php");
+		$text  = "Your include file should define \$text variable which holds this text and \$title variable which is page title";
+		$title = "You should define \$title variable with page title";
+		include($inc_file);
+		StartHTML($title, $text) ;
+		print "<p>".GifIcon(up)." Back to <a href=$GLOBALS[PHP_SELF]>front page</a>.</p>";
+		EndHTML() ;
+		exit ;
 	}
 
 	// default: display directory $relDir