--- docman.php	2001/02/15 22:14:21	1.33
+++ docman.php	2001/06/19 11:08:20	1.42
@@ -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>
@@ -974,7 +985,7 @@
 		$msg=fgets($note,4096);
 		fclose($note);
 	}
-	return StripSlashes($msg);
+	return HtmlSpecialChars(StripSlashes($msg));
 
 }
 
@@ -1055,12 +1066,40 @@
 
 //////////////////////////////////////////////////////////////////
 
-function safe_rename($from,$to) {
-	if (file_exists($from) && is_writable(dirname($to))) {
-		rename($from,$to);
+function safe_rename($fromdir,$fromfile,$tofile) {
+	function try_rename($from,$to) {
+#		print "$from -> $to\n";
+		if (file_exists($from) && is_writeable(dirname($to))) {
+			rename($from,$to);
+		}
+	}
+
+	function try_dir($todir) {
+		if (! file_exists($todir)) {
+			mkdir($todir,0700);
+	        }
+	}
+
+	$to="$fromdir/$tofile";
+	$todir=dirname($to);
+	$tofile=basename($to);
+
+#	print "<pre>$fromdir / $fromfile -> $todir / $tofile\n\n";
+
+	try_rename("$fromdir/$fromfile","$todir/$tofile");
+	try_dir("$todir/.log");
+	try_rename("$fromdir/.log/$fromfile","$todir/.log/$tofile");
+	try_dir("$todir/.note");
+	try_rename("$fromdir/.note/$fromfile","$todir/.note/$tofile");
+	try_dir("$todir/.lock");
+	try_rename("$fromdir/.lock/$fromfile","$todir/.lock/$tofile");
+	try_dir("$todir/.bak");
+	for($i=0;$i<=$GLOBALS[gblNumBackups];$i++) {
+		try_rename("$fromdir/.bak/$i/$fromfile","$todir/.bak/$i/$tofile");
 	}
 }
 
+
 //////////////////////////////////////////////////////////////////
 
 // recursivly delete directory
@@ -1138,7 +1177,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");
@@ -1184,6 +1223,8 @@
 		$relDir = urldecode($D) ;  // then use GET
 	}	
 
+	$relDir=stripSlashes($relDir);
+
 	if ($relDir == "/") $relDir = "" ; 	
 	// default : website root = ""
 
@@ -1218,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) ;
@@ -1293,7 +1338,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) {
@@ -1365,14 +1410,7 @@
 		if ( $CONFIRM != "on" ) break ;
 
 		Logit("$fsDir/$FN","renamed $FN to $NEWNAME");
-		safe_rename("$fsDir/$FN","$fsDir/$NEWNAME");
-		safe_rename("$fsDir/.log/$FN","$fsDir/.log/$NEWNAME");
-		safe_rename("$fsDir/.note/$FN","$fsDir/.note/$NEWNAME");
-		safe_rename("$fsDir/.lock/$FN","$fsDir/.lock/$NEWNAME");
-		for($i=0;$i<=$GLOBALS[gblNumBackups];$i++) {
-			safe_rename("$fsDir/.bak/$i/$FN","$fsDir/.bak/$i/$NEWNAME");
-		}
-
+		safe_rename($fsDir,$FN,$NEWNAME);
 		break ;
 
 	case "NOTE" :