--- docman.php	2000/08/04 10:13:10	1.7
+++ docman.php	2000/09/13 09:59:51	1.23
@@ -65,9 +65,9 @@
 TODO:
 	mixed file/directory output (add type to each entry,
 		real support for links)
-	add more content-management (like cms.sourceforge.net):
-		check-out/check-in/reserve
-		comments to files
+	retrieve old versions of files (overwritten)
+	show last lock date
+	
 */
 
 //////////////////////////////////////////////////////////////////
@@ -108,6 +108,7 @@
 			if ($user[0] == $GLOBALS["PHP_AUTH_USER"]) {
 				$gblUserName=$user[1];
 				$gblPw=$user[2];
+				$gblEmail=$user[3];
 				continue ;
 			}
 		}
@@ -120,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
@@ -194,7 +198,7 @@
 </small>
 </P>
 <BR>
-<? include(".debug.inc") ?>
+<? //include(".debug.inc") ?>
 <BR><BR></BODY></HTML>
 
 <?php
@@ -294,12 +298,14 @@
 </FORM>
 
 <?php
-	} else if ( strstr( join(" ",$gblImages), $ext ) ) {  
+	}
+	if ( !$file_lock && $ext!="" && strstr(join(' ',$gblImages),$ext) ) {  
 		$info  = getimagesize($fsPath) ;
-		$tstr  = "<IMG SRC=\"". $relPath . "\" BORDER=0 " ;
+		$tstr = "<IMG SRC=\"".urlpath($relPath)."\" BORDER=0 " ;
 		$tstr .= $info[3] . " ALT=\"" . $fn . " - " ;
 		$tstr .= (int)(($fsize+1023)/1024) . "Kb\">" ;
-		echo htmlentities($tstr) . "<BR><BR>" . $tstr ;
+//		echo htmlentities($tstr) . "<BR><BR>" . $tstr ;
+		echo $tstr ;
 	}
 
 ?>
@@ -361,18 +367,30 @@
 </FORM>
 
 <?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") {
@@ -677,6 +695,7 @@
 		$text .= ", <a href=$self?D=".urlencode($relDir)."&show_deleted=1>undelete</a>";
 	}
 	$text .= " or revise files on this web site." ;
+	$text .= "<br>Examine list of files <a href=\"$self?A=Ch1\">changed in last day</a> or <a href=\"$self?A=Ch\">all changes</a>.";
 	StartHTML("(Navigate)",$text) ;
 
 	echo "<TABLE BORDER=0 CELLPADDING=2 
@@ -743,9 +762,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 +850,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>
@@ -848,8 +867,7 @@
  <INPUT TYPE="HIDDEN" NAME="POSTACTION" VALUE="CREATE">
  <INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ?>">
  <INPUT TYPE="SUBMIT" VALUE="CREATE"></NOBR> 
- <NOBR>OR <A HREF="<?= $self 
-	?>?A=U&D=<?= urlencode($relDir) ?>">UPLOAD</A> A FILE
+ <NOBR>OR <A HREF="<?= $self ?>?A=U&D=<?= urlencode($relDir) ?>">UPLOAD</A> A FILE
  </NOBR>
 </TD></TR>
 </FORM>
@@ -958,7 +976,7 @@
 
 //////////////////////////////////////////////////////////////////
 
-function Logit($target,$msg) {
+function LogIt($target,$msg) {
 
 	$dir=dirname($target);
 	if (! file_exists($dir."/.log")) {
@@ -978,6 +996,7 @@
 
 function WriteNote($target,$msg) {
 
+	$target=stripSlashes($target);
 	$dir=dirname($target);
 	if (! file_exists($dir."/.note")) {
 		mkdir($dir."/.note",0700);
@@ -994,6 +1013,7 @@
 
 function ReadNote($target) {
 
+	$target=stripSlashes($target);
 	$dir=dirname($target);
 	$file=basename($target);
 	$msg="";
@@ -1010,6 +1030,7 @@
 
 function MoveTo($source,$folder) {
 
+	$source=stripSlashes($source);
 	$file=basename($source);
 	if (! file_exists($folder)) {
 		mkdir($folder,0700);
@@ -1023,6 +1044,7 @@
 
 function Lock($target) {
 
+	$target=stripSlashes($target);
 	$dir=dirname($target);
 	if (! file_exists($dir."/.lock")) {
 		mkdir($dir."/.lock",0700);
@@ -1043,6 +1065,7 @@
 
 function CheckLock($target) {
 
+	$target=stripSlashes($target);
 	$dir=dirname($target);
 	$file=basename($target);
 	$msg=0;
@@ -1057,6 +1080,7 @@
 
 function Unlock($target) {
 
+	$target=stripSlashes($target);
 	$dir=dirname($target);
 	$file=basename($target);
 	if (file_exists($dir."/.lock/$file")) {
@@ -1070,11 +1094,76 @@
 
 //////////////////////////////////////////////////////////////////
 
-function redir_to_url($url) {
-	$url=urlencode(StripSlashes("$relDir/$F"));
+function urlpath($url) {
+	$url=urlencode(StripSlashes("$url"));
 	$url=str_replace("%2F","/",$url);
 	$url=str_replace("+","%20",$url);
-	Header("Location: $url");
+	return($url);
+}
+
+//////////////////////////////////////////////////////////////////
+
+function safe_rename($from,$to) {
+	if (file_exists($from) && is_writable(dirname($to))) {
+		rename($from,$to);
+	}
+}
+
+//////////////////////////////////////////////////////////////////
+
+// 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);
+}
+
+//////////////////////////////////////////////////////////////////
+
+function ChangeLog($target,$msg) {
+
+	global $gblFsRoot;
+	$log=fopen("$gblFsRoot/.changelog","a+");
+	if (substr($target,0,strlen($gblFsRoot)) == $gblFsRoot)
+		$target=substr($target,strlen($gblFsRoot),strlen($target)-strlen($gblFsRoot));
+	fputs($log,time()."\t$target\t$GLOBALS[gblUserName]\t$msg\n");
+	fclose($log);
+
+}
+
+function DisplayChangeLog($day) {
+
+	global $gblFsRoot;
+	if (!file_exists("$gblFsRoot/.changelog")) return;
+	$log=fopen("$gblFsRoot/.changelog","r");
+	$logarr = array();
+	while($line = fgetcsv($log,255,"\t")) {
+		if ($day!=1 || ($day==1 && (time()-$line[0] < 24*60*60))) {
+			array_unshift($logarr,array($line[0],$line[1],$line[2],$line[3]));
+		}
+	}
+	fclose($log);
+	$cl1=" class=lst"; $cl2="";
+	print "<table border=0 width=100%>\n";
+	while ($e = array_shift($logarr)) {
+		$cl=$cl1; $cl1=$cl2; $cl2=$cl;
+		$date = date("$GLOBALS[gblDateFmt]", $e[0]);
+		$time = date("$GLOBALS[gblTimeFmt]", $e[0]);
+		$dir = dirname($e[1]);
+		$file = basename($e[1]);
+		print "<tr><td$cl>$date</td><td$cl>$time</td><td$cl><a href=\"$GLOBALS[PHP_SELF]?D=".urlencode($dir)."\">$dir</a>/$file</td><td$cl>$e[2]</td><td$cl>$e[3]</td></tr>\n";
+	}
+	print "</table>";
+	print "<p>".GifIcon(up)." Back to <a href=$GLOBALS[PHP_SELF]>front page</a>.</p>";
 }
 
 //////////////////////////////////////////////////////////////////
@@ -1136,7 +1225,9 @@
 
 	$fsDir = $gblFsRoot . $relDir ; // current directory
 	if ( !is_dir($fsDir) ) Error("Dir not found",$relDir) ;
-	
+
+	$FN=stripSlashes($FN);
+
 	switch ($POSTACTION) {
 	case "UPLOAD" :
 		if (!is_writeable($fsDir)) Error("Write denied",$relDir) ;
@@ -1172,10 +1263,12 @@
 		if (isset($FILENAME)) {
 			Unlock($target);
 		}
+		ChangeLog($target,"updated");
 		break ;
 
 	case "SAVE" :
-		$path = $gblFsRoot . escapeshellcmd($RELPATH) ;
+		$path = $gblFsRoot . $RELPATH ;
+		$path=stripSlashes($path);
 		$writable = is_writeable($path) ;
 		$legaldir = is_writeable(dirname($path)) ;
 		$exists   = (file_exists($path)) ? 1 : 0 ; 
@@ -1183,10 +1276,12 @@
 	 	if (!($writable || (!$exists && $legaldir))) 
 			Error("Write denied",$RELPATH) ;
 		$fh = fopen($path, "w") ;
+		$FILEDATA=stripSlashes($FILEDATA);
 		fwrite($fh,$FILEDATA) ;
 		fclose($fh) ;
 		clearstatcache() ;
 		Logit($path,"saved changes");
+		ChangeLog($path,"saved changes");
 		break ;
 
 	case "CREATE" :
@@ -1217,6 +1312,7 @@
 			}
 			$tstr = "$PHP_SELF?A=E&D=".urlencode($relDir)."&F=".urlencode($FN) ;
 			header("Location: " . $tstr) ;
+			ChangeLog($target,"created");
 			exit ;
 		}
 		break ;
@@ -1249,7 +1345,7 @@
 			}
 		}
 		else {  // delete directory
-		  if ( ! @rmdir($fsDir) ) {
+		  if ( ! @rrmdir($fsDir) ) {
 		    Error("Rmdir failed", $tstr . $fsDir) ; 
 		  }
 		  else {
@@ -1276,10 +1372,13 @@
 		if ( $CONFIRM != "on" ) break ;
 
 		Logit("$fsDir/$FN","renamed $FN to $NEWNAME");
-		rename("$fsDir/$FN","$fsDir/$NEWNAME");
-		rename("$fsDir/.log/$FN","$fsDir/.log/$NEWNAME");
-		rename("$fsDir/.note/$FN","$fsDir/.note/$NEWNAME");
-		rename("$fsDir/.lock/$FN","$fsDir/.lock/$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");
+		}
 
 		break ;
 
@@ -1311,7 +1410,7 @@
 	// $A=Ci : checkin file $D/$F
 	// $A=V : view file (do nothing except log)
 	// default : display directory $D
-	
+
 	switch ($A) {
 	case "U" :
 		// upload to $relDir
@@ -1324,19 +1423,23 @@
 		EndHTML() ;
 		exit ;
 	case "E" :
+		$F=stripSlashes($F);
 		// detail of $relDir/$F
 		if (is_file("$gblFsRoot/$relDir/$F")) DetailPage($gblFsRoot, $relDir, $F) ;
 		exit ;
 	case "C" :
+		$F=stripSlashes($F);
 		// listing of $relDir/$F 
 		DisplayCode($gblFsRoot, $relDir, $F) ;
 		exit ;
 	case "Co" :
 		// checkout
 		Lock("$gblFsRoot/$relDir/$F");
-		redir_to_url("$relDir/$F");
+		header("Content-Disposition: attachment; filename=$F" );
+		Header("Location: ".urlpath("$relDir/$F"));
 		exit;
 	case "Ci" :
+		$F=stripSlashes($F);
 		// upload && update to $relDir
 		if (!is_writeable($gblFsRoot . $relDir)) 
 			Error("Write access denied",$relDir) ;
@@ -1348,8 +1451,19 @@
 		exit ;
 	case "V" :
 		// view
-		Log("viewed");
-		redir_to_url("$relDir/$F");
+		LogIt("$gblFsRoot/$relDir/$F","viewed");
+		header("Content-Disposition: attachment; filename=$F" );
+		Header("Location: ".urlpath("$relDir/$F"));
+		exit;
+	case "Ch" :
+		StartHTML("(File changes)","All changes chronologicaly...");
+		DisplayChangeLog(0);	// all
+		EndHTML() ;
+		exit;
+	case "Ch1" :
+		StartHTML("(File changes)","Changes to files in last day...");
+		DisplayChangeLog(1);
+		EndHTML() ;
 		exit;
 	}