--- docman.php	2001/02/23 11:51:39	1.34
+++ docman.php	2001/04/03 13:35:07	1.39
@@ -236,14 +236,16 @@
 		$fsize = filesize($fsPath) ; 
 		$fmodified = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", filemtime($fsPath)) ;
 		$faccessed = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", fileatime($fsPath)) ;
-		$userinfo = posix_getpwuid(fileowner($fsPath));
-		$grpinfo = posix_getgrgid(filegroup($fsPath));
+		$fuid=fileowner($fsPath);
+		$fgid=filegroup($fsPath);
+		$userinfo = posix_getpwuid($fuid);
+		$grpinfo = posix_getgrgid($fgid);
 		echo "<PRE>";
-		if (!is_dir($fsPath)) echo "file size: " . $fsize . " Bytes<BR>" ;
+		if (!is_dir($fsPath)) echo "    file size: " . $fsize . " Bytes<BR>" ;
 		echo "last modified: <B>" . $fmodified . "</B><BR>" ;
 		echo "last accessed: <B>" . $faccessed . "</B><BR>" ;
-		echo "        owner: <B>" . $userinfo["name"] . "</B><BR>" ;
-		echo "        group: <B>" . $grpinfo["name"] . "</B><BR>" ;
+		echo "        owner: <B>" . $userinfo["name"] . " [$fuid]</B><BR>" ;
+		echo "        group: <B>" . $grpinfo["name"] . " [$fgid]</B><BR>" ;
 		echo "  permissions: <B>" ; 
 		echo printf( "%o", fileperms($fsPath) ) . "</B>" ;
 		echo "</PRE>" ;
@@ -1057,8 +1059,8 @@
 
 function safe_rename($fromdir,$fromfile,$tofile) {
 	function try_rename($from,$to) {
-		print "$from -> $to\n";
-		if (file_exists($from) && is_writable(dirname($to))) {
+#		print "$from -> $to\n";
+		if (file_exists($from) && is_writeable(dirname($to))) {
 			rename($from,$to);
 		}
 	}
@@ -1073,7 +1075,7 @@
 	$todir=dirname($to);
 	$tofile=basename($to);
 
-	print "<pre>$fromdir / $fromfile -> $todir / $tofile\n\n";
+#	print "<pre>$fromdir / $fromfile -> $todir / $tofile\n\n";
 
 	try_rename("$fromdir/$fromfile","$todir/$tofile");
 	try_dir("$todir/.log");
@@ -1166,7 +1168,7 @@
 
 	$htusers_file=dirname($SCRIPT_FILENAME)."/.htusers";
 	if (! file_exists($htusers_file)) {
-		if (is_writable(dirname($SCRIPT_FILENAME))) {
+		if (is_writeable(dirname($SCRIPT_FILENAME))) {
 			$htusers=fopen($htusers_file,"a+");
 			fputs($htusers,"# Change owner of $htusers_file to root !!\n");
 			fputs($htusers,"demo:full name:[md5_hash|auth_*]:e-mail\n");
@@ -1212,6 +1214,8 @@
 		$relDir = urldecode($D) ;  // then use GET
 	}	
 
+	$relDir=stripSlashes($relDir);
+
 	if ($relDir == "/") $relDir = "" ; 	
 	// default : website root = ""
 
@@ -1246,6 +1250,10 @@
 
 	$FN=stripSlashes($FN);
 
+	if (file_exists("$fsScriptDir/.docman.conf")) {
+		include("$fsScriptDir/.docman.conf");
+	}
+
 	switch ($POSTACTION) {
 	case "UPLOAD" :
 		if (!is_writeable($fsDir)) Error("Write denied",$relDir) ;
@@ -1321,7 +1329,7 @@
 // this functionality is doubled in DetailView().
 // better keep it here altogether
 // chmod perms to $gblFilePerms
-			if ( file_exists($path) && !is_writable($path) ) 
+			if ( file_exists($path) && !is_writeable($path) ) 
 				Error("File not writable", $relPath) ;
 			$fh = fopen($path, "w+") ;
 			if ($fh) {