--- docman.php	2001/03/11 15:36:51	1.35
+++ docman.php	2001/06/04 08:20:55	1.41
@@ -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>" ;
@@ -692,12 +694,20 @@
 <?php
 	}
 
+function plural($name,$count) {
+	$out="$count $name";
+	if ($count > 1) {
+		$out.="s";
+	}
+	return $out;
+}
+
 	// output subdirs
 	if (sizeof($dirList) > 0) {
 		sort($dirList) ; 
 ?>
 
-<TR><TD></TD><TD COLSPAN=2 CLASS=TOP>DIRECTORY NAME</TD><TD COLSPAN=3 CLASS=TOP>DIRECTORY NOTE</TR>
+<TR><TD></TD><TD COLSPAN=2 CLASS=TOP>DIRECTORY NAME (<?= plural("dir",sizeof($dirList)) ?>)</TD><TD COLSPAN=3 CLASS=TOP>DIRECTORY NOTE</TR>
 
 <?php
 		while (list($key,$dir) = each($dirList)) {
@@ -722,7 +732,7 @@
 
 <TR><TD></TD><TD COLSPAN=5><HR><B><?= $webRoot . $relDir ?>
 </B></TD></TR>
-<TR><TD></TD><TD CLASS=TOP>DOCUMENT NAME</TD>
+<TR><TD></TD><TD CLASS=TOP>DOCUMENT NAME (<?= plural("file",sizeof($fileList)) ?>)</TD>
 <TD><?= $gblIcon("blank").$gblIcon("blank") ?></TD>
 <TD CLASS=TOP>NOTE</TD>
 <TD CLASS=TOP>LAST UPDATE</TD><TD CLASS=TOP>FILE SIZE</TD></TR>
@@ -854,7 +864,8 @@
  <NOBR>NAME <INPUT TYPE="TEXT" NAME="FN" SIZE=14>
  <INPUT TYPE="HIDDEN" NAME="POSTACTION" VALUE="CREATE">
  <INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ?>">
- <INPUT TYPE="SUBMIT" VALUE="CREATE"></NOBR> 
+ <INPUT TYPE="SUBMIT" VALUE="CREATE" NAME="CREATE">
+ </NOBR> 
  <NOBR>OR <A HREF="<?= $self ?>?A=U&D=<?= urlencode($relDir) ?>">UPLOAD</A> A FILE
  </NOBR>
 </TD></TR>
@@ -1057,7 +1068,7 @@
 
 function safe_rename($fromdir,$fromfile,$tofile) {
 	function try_rename($from,$to) {
-		print "$from -> $to\n";
+#		print "$from -> $to\n";
 		if (file_exists($from) && is_writeable(dirname($to))) {
 			rename($from,$to);
 		}
@@ -1073,7 +1084,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");
@@ -1212,6 +1223,8 @@
 		$relDir = urldecode($D) ;  // then use GET
 	}	
 
+	$relDir=stripSlashes($relDir);
+
 	if ($relDir == "/") $relDir = "" ; 	
 	// default : website root = ""
 
@@ -1246,6 +1259,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) ;