--- docman.php 2001/12/15 20:33:37 1.50
+++ 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="") {
@@ -184,10 +184,10 @@
}
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";
}
- $url.="&AU=${PHP_AUTH_USER}|AP=${PHP_AUTH_PW}|";
?>
[= $url_title ?>]
@@ -196,7 +196,7 @@
© 1999 by ANYPORTAL,
© 2000 by d@nger.org,
-© 2000 by DbP
+© 2000-2002 by DbP
@@ -1175,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";
@@ -1243,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
@@ -1268,7 +1267,7 @@
)
) && (
$PHP_AUTH_PW == "" || !isset($PHP_AUTH_PW)
- )
+ ) && !isset($force_login)
) {
StartHTML("Logout completed","Your login credentials has been erased") ;
EndHTML() ;
@@ -1278,7 +1277,8 @@
// authentication failure
if ( md5($PHP_AUTH_USER.$PHP_AUTH_PW) != $gblPw ||
isset($relogin) && $gblPw == $relogin) {
- header("WWW-authenticate: basic realm=\"$HTTP_HOST\"") ;
+ $realm="$HTTP_HOST";
+ header("WWW-authenticate: basic realm=\"$realm\"") ;
header("HTTP/1.0 401 Unauthorized") ;
NoEntry() ;
exit ;