--- docman.php	2000/08/04 10:43:23	1.9
+++ docman.php	2000/09/06 14:25:15	1.17
@@ -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
+	
 */
 
 //////////////////////////////////////////////////////////////////
@@ -106,6 +108,7 @@
 			if ($user[0] == $GLOBALS["PHP_AUTH_USER"]) {
 				$gblUserName=$user[1];
 				$gblPw=$user[2];
+				$gblEmail=$user[3];
 				continue ;
 			}
 		}
@@ -118,8 +121,11 @@
 	$gblDateFmt="Y-m-d";
 	$gblTimeFmt="H:i:s";
 
-// Number of backup files to keep
-	$gblNumBackups=5;
+	// Number of backup files to keep
+	$gblNumBackups=3;
+
+	// show red star if newer than ... days
+	$gblModDays=1;
 
 	// choose GifIcon below unless you have the M$
 	// WingDings font installed on your system
@@ -293,7 +299,7 @@
 
 <?php
 	}
-	if ( !$file_lock && strstr(join(" ",$gblImages),$ext) ) {  
+	if ( !$file_lock && $ext!="" && strstr(join(' ',$gblImages),$ext) ) {  
 		$info  = getimagesize($fsPath) ;
 		$tstr = "<IMG SRC=\"".urlpath($relPath)."\" BORDER=0 " ;
 		$tstr .= $info[3] . " ALT=\"" . $fn . " - " ;
@@ -362,17 +368,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>";
 	}
 
@@ -628,7 +646,7 @@
 
 function Navigate($fsRoot,$relDir) {
 
-	global $gblEditable, $gblIcon ;
+	global $gblEditable, $gblIcon, $gblModDays ;
 
 	$self     = $GLOBALS["PHP_SELF"] ;
 	if (isset($GLOBALS["HTTPS"]) && $GLOBALS["HTTPS"] == "on") {
@@ -743,9 +761,9 @@
 
 		$info_url=$self."?A=E&F=".urlencode($file)."&D=".urlencode($relDir);
 
-		if ( ($mod + 30*86400) > time() ) {
+		if ( ($mod + $gblModDays*86400) > time() ) {
 			$a  = "<SPAN CLASS=RED TITLE=\"Newer" ;
-			$a .= " than 30 days\"> * </SPAN>" ;
+			$a .= " than $gblModDays days\"> * </SPAN>" ;
 		}
 
 		$file_lock=CheckLock($path);
@@ -831,11 +849,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>
@@ -1086,6 +1104,24 @@
 
 //////////////////////////////////////////////////////////////////
 
+// recursivly delete directory
+
+function rrmdir($dir) {
+	$handle=opendir($dir);
+	while ($file = readdir($handle)) {
+		if ($file != "." && $file != "..") {
+			if (is_dir("$dir/$file"))
+				rrmdir("$dir/$file");
+			else
+				if (! @unlink("$dir/$file")) return(0);
+		}
+	}
+	closedir($handle);
+	return @rmdir($dir);
+}
+
+//////////////////////////////////////////////////////////////////
+
 // MAIN PROGRAM
 // ============
 // query parameters: capital letters
@@ -1182,7 +1218,7 @@
 		break ;
 
 	case "SAVE" :
-		$path = $gblFsRoot . escapeshellcmd($RELPATH) ;
+		$path = $gblFsRoot . $RELPATH ;
 		$writable = is_writeable($path) ;
 		$legaldir = is_writeable(dirname($path)) ;
 		$exists   = (file_exists($path)) ? 1 : 0 ; 
@@ -1256,7 +1292,7 @@
 			}
 		}
 		else {  // delete directory
-		  if ( ! @rmdir($fsDir) ) {
+		  if ( ! @rrmdir($fsDir) ) {
 		    Error("Rmdir failed", $tstr . $fsDir) ; 
 		  }
 		  else {
@@ -1287,6 +1323,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 +1380,7 @@
 	case "Co" :
 		// checkout
 		Lock("$gblFsRoot/$relDir/$F");
+		header("Content-Disposition: attachment; filename=$F" );
 		Header("Location: ".urlpath("$relDir/$F"));
 		exit;
 	case "Ci" :
@@ -1356,6 +1396,7 @@
 	case "V" :
 		// view
 		LogIt("$gblFsRoot/$relDir/$F","viewed");
+		header("Content-Disposition: attachment; filename=$F" );
 		Header("Location: ".urlpath("$relDir/$F"));
 		exit;
 	}