--- docman.php	2001/03/12 13:30:44	1.37
+++ docman.php	2001/06/19 11:08:20	1.42
@@ -694,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)) {
@@ -724,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>
@@ -856,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>
@@ -976,7 +985,7 @@
 		$msg=fgets($note,4096);
 		fclose($note);
 	}
-	return StripSlashes($msg);
+	return HtmlSpecialChars(StripSlashes($msg));
 
 }
 
@@ -1059,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);
 		}
@@ -1075,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");
@@ -1250,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) ;