--- docman.php	2000/08/04 10:43:23	1.9
+++ docman.php	2000/09/06 10:49:15	1.13
@@ -66,6 +66,8 @@
 	mixed file/directory output (add type to each entry,
 		real support for links)
 	retrieve old versions of files (overwritten)
+	show last lock date
+	
 */
 
 //////////////////////////////////////////////////////////////////
@@ -362,17 +364,29 @@
 
 <?php
 	
-
-	$logname=dirname("$fsDir/$fn")."/.log/".basename("$fsDir/$fn");
+	$name=basename("$fsDir/$fn");
+	$logname=dirname("$fsDir/$fn")."/.log/$name";
+	$bakdir=dirname("$fsDir/$fn")."/.bak";
 	if (file_exists($logname)) {
-		print "<hr><br><b>CHANGES TO THIS FILE</b><br><table border=0 width=100%>\n";
 		$log=fopen($logname,"r");
 		$cl1=" class=lst"; $cl2="";
+		$logarr = array();
 		while($line = fgetcsv($log,255,"\t")) {
 			$cl=$cl1; $cl1=$cl2; $cl2=$cl;
-			print "<tr><td$cl>$line[0]</td><td$cl>$line[1]</td><td$cl>$line[2]</td><td$cl>$line[3]</td></tr>\n";
+			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";
+		$bakcount = 0;	// start from 0, skip fist backup (it's current)
+		while ($e = array_shift($logarr)) {
+			if (strstr($e[4],"upload")) {
+				if (file_exists("$bakdir/$bakcount/$name")) {
+					$e[4]="<a href=\"".dirname($relPath)."/.bak/$bakcount/$name\">$e[4]</a>";
+				}
+				$bakcount++;
+			}
+			print "<tr><td$e[0]>$e[1]</td><td$e[0]>$e[2]</td><td$e[0]>$e[3]</td><td$e[0]>$e[4]</td></tr>\n";
+		}
 		print "</table>";
 	}
 
@@ -831,11 +845,11 @@
 <TR><TD></TD><TD COLSPAN=5><HR></TD></TR>
 
 <TR><TD></TD><TD COLSPAN=5>
-To just view file without editing, select it's filename (<b>don't edit files which are opened this way!</b>)<br>
-To <b>edit</b> file select <?= $gblIcon("checkout") ?> to check-out
-and edit it locally. After editing is over, select filename or <?= $gblIcon("checkin") ?> to check-in (update copy of file on server).<br>
-<by>If you select icon left from filename, you will get detailed information
-about file, as well as delete, rename and annotation options. 
+<?
+if (file_exists(".info.inc")) {
+	include(".info.inc");
+}
+?>
 </TD></TR>
 
 <TR><TD></TD><TD COLSPAN=5><HR></TD></TR>
@@ -1287,6 +1301,9 @@
 		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");
+		}
 
 		break ;
 
@@ -1341,6 +1358,7 @@
 	case "Co" :
 		// checkout
 		Lock("$gblFsRoot/$relDir/$F");
+		header("Content-Disposition: attachment; filename=$F" );
 		Header("Location: ".urlpath("$relDir/$F"));
 		exit;
 	case "Ci" :
@@ -1356,6 +1374,7 @@
 	case "V" :
 		// view
 		LogIt("$gblFsRoot/$relDir/$F","viewed");
+		header("Content-Disposition: attachment; filename=$F" );
 		Header("Location: ".urlpath("$relDir/$F"));
 		exit;
 	}