--- docman.php	2001/02/15 21:20:53	1.32
+++ docman.php	2001/02/23 11:51:39	1.34
@@ -222,7 +222,11 @@
 		Error("Creation denied",$relDir) ;
 
 	$text  = "Use this page to view, modify or " ;
-	$text .= "delete a single document on this " ;
+	if (is_dir($fsPath)) {
+		$text .="delete a directory on this " ;
+	} else {
+		$text .= "delete a single document on this " ;
+	};
 	$text .= "web site." ;	
 	$title = "(Detail Page)" ;
 	StartHTML($title, $text) ;
@@ -232,18 +236,21 @@
 		$fsize = filesize($fsPath) ; 
 		$fmodified = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", filemtime($fsPath)) ;
 		$faccessed = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", fileatime($fsPath)) ;
-		echo "<PRE>    file size: " . $fsize . " Bytes<BR>" ;
+		$userinfo = posix_getpwuid(fileowner($fsPath));
+		$grpinfo = posix_getgrgid(filegroup($fsPath));
+		echo "<PRE>";
+		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>" . fileowner($fsPath) . "</B><BR>" ;
-		echo "        group: <B>" . filegroup($fsPath) . "</B><BR>" ;
+		echo "        owner: <B>" . $userinfo["name"] . "</B><BR>" ;
+		echo "        group: <B>" . $grpinfo["name"] . "</B><BR>" ;
 		echo "  permissions: <B>" ; 
 		echo printf( "%o", fileperms($fsPath) ) . "</B>" ;
 		echo "</PRE>" ;
 
 	}
 
-	if ( $editable && ($writable || !$exists) && !$file_lock ) { 
+	if ( !is_dir($fsPath) && $editable && ($writable || !$exists) && !$file_lock ) { 
 		$fh = fopen($fsPath,"a+") ;
 		rewind($fh) ;
 		$fstr = fread($fh,filesize($fsPath)) ;
@@ -350,7 +357,12 @@
 			array_unshift($logarr,array($cl,$line[0],$line[1],$line[2],$line[3]));
 		}
 		fclose($log);
-		print "<hr><br><b>CHANGES TO THIS FILE</b><br><table border=0 width=100%>\n";
+		if (is_dir("$fsDir/$fn")) {
+			$whatis="DIRECTORY";
+		} else {
+			$whatis="FILE";
+		}
+		print "<hr><br><b>CHANGES TO THIS $whatis</b><br><table border=0 width=100%>\n";
 		$bakcount = 0;	// start from 0, skip fist backup (it's current)
 		while ($e = array_shift($logarr)) {
 			if (strstr($e[4],"upload")) {
@@ -685,18 +697,23 @@
 		sort($dirList) ; 
 ?>
 
-<TR><TD></TD><TD COLSPAN=5 CLASS=TOP><HR>DIRECTORY NAME</TD></TR>
+<TR><TD></TD><TD COLSPAN=2 CLASS=TOP>DIRECTORY NAME</TD><TD COLSPAN=3 CLASS=TOP>DIRECTORY NOTE</TR>
 
 <?php
 		while (list($key,$dir) = each($dirList)) {
 
+			$info_url=$self."?A=E&F=".urlencode($dir)."&D=".urlencode($relDir);
 			$tstr = "<A HREF=\"" . $self . "?D=" ; 
 			$tstr .= urlencode($relDir."/".$dir) ;
 			$tstr .= "\">" . $dir . "/</A>" ;
+			$note_html="<a href=\"$info_url#note\">".$gblIcon("note")."</a>".ReadNote($fsDir.$dir);
 ?>
 
-<TR><TD><?= $gblIcon("fldr") ?></TD>
-<TD COLSPAN=5 CLASS=LST><?= $tstr ?></TD></TR>
+<TR><TD>
+<A HREF="<?= $info_url ?>" TITLE="View/Edit">
+<?= $gblIcon("fldr") ?></A></TD>
+<TD COLSPAN=2 CLASS=LST><?= $tstr ?></TD>
+<TD COLSPAN=3 CLASS=LST><?= $note_html ?></TD></TR>
 
 <?php
 		}  // iterate over dirs
@@ -1038,12 +1055,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_writable(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
@@ -1348,14 +1393,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" :  
@@ -1401,7 +1439,7 @@
 	case "E" :
 		$F=stripSlashes($F);
 		// detail of $relDir/$F
-		if (is_file("$gblFsRoot/$relDir/$F")) DetailPage($gblFsRoot, $relDir, $F) ;
+		if (is_file("$gblFsRoot/$relDir/$F") || is_dir("$gblFsRoot/$relDir/$F")) DetailPage($gblFsRoot, $relDir, $F) ;
 		exit ;
 	case "C" :
 		$F=stripSlashes($F);