--- docman.php	2000/09/13 09:59:51	1.23
+++ docman.php	2000/12/21 08:25:06	1.26
@@ -35,22 +35,14 @@
 /*             existent address after file modifications.       */
 
 /*
-	2000-07-25 Dobrica Pavlinusic <dpavlin@rot13.org>
 
-	nuked exec calls (unsecure)
-	nuked writeable function (replaced by php is_writeable)
-	added support for https (tested with apache+mod_ssl)
-	added users file
-	date format user-selectable
-	cycle backup files in bak directory
-	support links as directoryes (for now)
-	support of file history logging
-	undelete capabilities (delete moves to .del directory)
+	This project is now called Directory Manager.
 
-	2000-07-26 DbP
+	For more info, please see web pages at
+	http://www.rot13.org/~dpavlin/docman.html
 
-	added more checking on entered filename (when creating file/dir)
-	added rename option
+	It's relased under GPL by
+	Dobrica Pavlinusic <dpavlin@rot13.org>
 
 
 IMPORTANT INSTALLATION NOTE:
@@ -65,9 +57,8 @@
 TODO:
 	mixed file/directory output (add type to each entry,
 		real support for links)
-	retrieve old versions of files (overwritten)
-	show last lock date
-	
+	access controll
+
 */
 
 //////////////////////////////////////////////////////////////////
@@ -80,7 +71,7 @@
 
 // GLOBAL PARAMETERS
 // =================
-// Make modifications here to suit siteman to your needs
+// Make modifications here to suit docman to your needs
 
 // 	error_reporting(4) ;		// how verbose ?
 
@@ -650,9 +641,9 @@
 
 	$self     = $GLOBALS["PHP_SELF"] ;
 	if (isset($GLOBALS["HTTPS"]) && $GLOBALS["HTTPS"] == "on") {
-		$webRoot  = "https://" . $GLOBALS["SERVER_NAME"] ;
+		$webRoot  = "https://" . $GLOBALS["HTTP_HOST"] ;
 	} else {
-		$webRoot  = "http://" . $GLOBALS["SERVER_NAME"] ;
+		$webRoot  = "http://" . $GLOBALS["HTTP_HOST"] ;
 	}
 	$fsDir    = $fsRoot . $relDir . "/" ; // current directory
 
@@ -829,7 +820,13 @@
 
 <?php
 	  }  // iterate over files
-	}  // end if no files
+	} else {  // end if no files
+?>
+ <TR><TD></TD><TD COLSPAN=5 CLASS=LST>
+  No files in this directory
+ </TD></TR>
+<?
+	}
 
 	if ($emptyDir) {
 ?>
@@ -849,15 +846,14 @@
 
 <TR><TD></TD><TD COLSPAN=5><HR></TD></TR>
 
-<TR><TD></TD><TD COLSPAN=5>
 <?
 if (file_exists(".info.inc")) {
+	print "<TR><TD></TD><TD COLSPAN=5>";
 	include(".info.inc");
+	print "</TD></TR>
+	<TR><TD></TD><TD COLSPAN=5><HR></TD></TR>";
 }
 ?>
-</TD></TR>
-
-<TR><TD></TD><TD COLSPAN=5><HR></TD></TR>
 
 <FORM METHOD="POST" ACTION="<?= $self ?>">
 <TR><TD></TD><TD COLSPAN=5 CLASS=BAR>CREATE NEW
@@ -879,7 +875,7 @@
 
 //////////////////////////////////////////////////////////////////
 
-function UploadPage($fsRoot, $relDir, $filename) {
+function UploadPage($fsRoot, $relDir, $filename="") {
 
 	$self = $GLOBALS["PHP_SELF"] ;
 	if ($relDir == "") $relDir = "/" ; 
@@ -889,7 +885,7 @@
 <FORM ENCTYPE="multipart/form-data" METHOD="POST" 
  ACTION="<?= $self ?>">
 DESTINATION DIRECTORY:<B><?= " " . $relDir ?></B>
-<? if (isset($filename)) { ?>
+<? if (isset($filename) && $filename!="") { ?>
 <br>DESTINATION FILE:<B><?= " " . $filename ?></B>
 <INPUT TYPE="HIDDEN" NAME="FILENAME" VALUE="<?= $filename ?>">
 <? } ?>
@@ -1191,7 +1187,7 @@
 	// authentication if $gblAuth == true
 	if ( $gblAuth && $gblHash($PHP_AUTH_USER.$PHP_AUTH_PW) != $gblPw ||
 		isset($relogin) && $gblPw == $relogin ) {
-		header("WWW-authenticate: basic realm=\"$SERVER_NAME\"") ;
+		header("WWW-authenticate: basic realm=\"$HTTP_HOST\"") ;
 		header("HTTP/1.0 401 Unauthorized") ;
 		NoEntry() ;
 		exit ;
@@ -1214,13 +1210,15 @@
 	// i.e. below $gblFsRoot.
 
 	$relScriptDir = dirname($SCRIPT_NAME) ;  	
-	// i.e. /siteman
+	// i.e. /docman
 
 	$fsScriptDir  = dirname($SCRIPT_FILENAME) ; 	
-	// i.e. /home/httpd/html/siteman
+	// i.e. /home/httpd/html/docman
 
-	$gblFsRoot = substr($fsScriptDir,0,
-	  strlen($fsScriptDir)-strlen($relScriptDir)) ;
+	// start on server root
+//	$gblFsRoot = substr($fsScriptDir,0, strlen($fsScriptDir)-strlen($relScriptDir)) ;
+	// or on script root
+	$gblFsRoot = $fsScriptDir;
 	// i.e. /home/httpd/html
 
 	$fsDir = $gblFsRoot . $relDir ; // current directory
@@ -1236,6 +1234,9 @@
 		// TODO : should rather check for escapeshellcmds
 		// but maybe RFC 18xx asserts safe filenames ....
 		$source = $FN ;
+		if (! file_exists($source)) {
+			Error("You must select file with browse to upload it!");
+		}
 		if (! isset($FILENAME)) { 	// from update file
 			$target = "$fsDir/$FN_name" ;
 		} else {
@@ -1417,7 +1418,7 @@
 		if (!is_writeable($gblFsRoot . $relDir)) 
 			Error("Write access denied",$relDir) ;
 		$text  = "Use this page to upload a single " ;
-		$text .= "file to <B>$SERVER_NAME</B>." ;
+		$text .= "file to <B>$HTTP_HOST</B>." ;
 		StartHTML("(Upload Page)", $text) ;
 		UploadPage($gblFsRoot, $relDir) ;
 		EndHTML() ;
@@ -1444,7 +1445,7 @@
 		if (!is_writeable($gblFsRoot . $relDir)) 
 			Error("Write access denied",$relDir) ;
 		$text  = "Use this page to update a single " ;
-		$text .= "file to <B>$SERVER_NAME</B>." ;
+		$text .= "file to <B>$HTTP_HOST</B>." ;
 		StartHTML("(Update file Page)", $text) ;
 		UploadPage($gblFsRoot, $relDir, $F) ;
 		EndHTML() ;