--- docman.php	2002/07/29 12:53:50	1.30
+++ docman.php	2002/07/29 13:53:56	1.31
@@ -157,6 +157,7 @@
 	
 	global $gblEditable, $gblImages,
 		$gblDateFmt, $gblTimeFmt,
+		$gblPermNote,
 		$webRoot, $html,
 		$HTTP_SERVER_VARS ;
 	$self = $HTTP_SERVER_VARS["PHP_SELF"] ;
@@ -208,25 +209,8 @@
 		$fstr = fread($fh,filesize($fsPath)) ;
 		fclose($fh) ;
 		$fstr = htmlentities( $fstr ) ;
-?>
-
-<FORM ACTION="<?= $self ?>" METHOD="POST">
-<SPAN TITLE="Click [SAVE] to store updated contents.">
-	<B>DOCUMENT CONTENTS</B>
-</SPAN><BR>
-<TEXTAREA NAME="FILEDATA" ROWS=18 COLS=70 WRAP="OFF"><?php 
-echo($fstr) ; ?></TEXTAREA>
-<INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ; ?>">
-<INPUT TYPE="HIDDEN" NAME="FN" VALUE="<?= $fn ; ?>">
-<INPUT TYPE="HIDDEN" NAME="POSTACTION" VALUE="SAVE">
-<INPUT TYPE="HIDDEN" SIZE=48 MAXLENGTH=255 NAME="RELPATH" 
-	VALUE="<?= $relPath ; ?>">
-<br>
-<INPUT TYPE="RESET" VALUE="UNDO ALL CHANGES">
-<INPUT TYPE="SUBMIT" VALUE="SAVE">
-</FORM>
 
-<?php
+		include("$html/DetailPage-edit.html");
 	}
 	if ( !$file_lock && $ext!="" && strstr(join(' ',$gblImages),$ext) ) {  
 		$info  = getimagesize($fsPath) ;
@@ -237,23 +221,15 @@
 		echo $tstr ;
 	}
 
-?>
 
-<FORM ACTION="<?= $self ; ?>" METHOD="POST">
-<INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ; ?>">
-<INPUT TYPE="HIDDEN" NAME="FN" VALUE="<?= $fn ; ?>">
-<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="CANCEL"><BR>
+	print '<FORM ACTION="'.$self.'" METHOD="POST">
+		<INPUT TYPE="HIDDEN" NAME="DIR" VALUE="'.$relDir.'">
+		<INPUT TYPE="HIDDEN" NAME="FN" VALUE="'.$fn.'">
+		<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="CANCEL"><BR>
+		';
 
-<?php
-
-	if ($file_lock) {
-?>
-<hr>
-<SPAN TITLE="Check OK and click UNLOCK to remove lock on file.">
-<B>OK TO FORCE LOCK REMOVAL ON "<?= $fn ; ?>" HELD BY <?= $file_lock ?>? </B></SPAN>
-<INPUT TYPE="CHECKBOX" NAME="CONFIRM">
-<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="UNLOCK">
-<?
+	if ($file_lock && check_perm($relDir.$fn,trperm_w)) {
+		include("$html/DetailPage-unlock.html");
 	} // file_lock
 
 	if (substr($fn,0,4) == ".del") {
@@ -265,37 +241,14 @@
 	}
 
 	if ($exists && $writable) {
-?>
-
-<HR>
-<a name="undelete">
-<SPAN TITLE="Check OK and click [<?= $action ?>] to <?= $desc ?>.">
-<B>OK TO <?= $action ?> "<?= $fn ; ?>"? </B></SPAN>
-<INPUT TYPE="CHECKBOX" NAME="CONFIRM">
-<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="<?= $action ?>">
-
-<HR>
-<a name="rename">
-<SPAN TITLE="Check OK and click [RENAME] to rename.">
-<B>OK TO RENAME "<?= $fn ; ?>" TO 
-<INPUT TYPE="TEXT" SIZE=24 MAXLENGTH=255 NAME="NEWNAME" VALUE="<?= $fn ?>">
-? </B></SPAN>
-<INPUT TYPE="CHECKBOX" NAME="CONFIRM">
-<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="RENAME">
+		include("$html/DetailPage-undelete.html");
+		include("$html/DetailPage-rename.html");
 
-<?php
-	}	// exists && writable
-?>
-<HR>
-<a name="note">
-<B>NOTE FOR "<?= $fn ; ?>":
-<INPUT TYPE="TEXT" SIZE=50 MAXLENGTH=255 NAME="NOTE" VALUE="<?= ReadNote($fsPath) ?>">
-</B></SPAN>
-<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="NOTE">
-
-</FORM>
+	} elseif (check_perm($relDir.$fn,$gblPermNote)) {
+			include("$html/DetailPage-note.html");
+	}
 
-<?php
+	print "</FORM>";
 
 	$name=basename("$fsDir/$fn");
 	$logname=dirname("$fsDir/$fn")."/.log/$name";
@@ -844,9 +797,11 @@
 				$file_url_html = "$file $a";
 			}
 		} else {
-			$b.="<A HREF=\"$self?A=Co&D=".urlencode($relDir)."&F=".urlencode($file);
-			$b.="\" TITLE=\"Checkout file for edit\">" ;
-			$b.=$gblIcon("checkout")."</A>";
+			if (check_perm($relDir.$file,trperm_w)) {
+				$b.="<A HREF=\"$self?A=Co&D=".urlencode($relDir)."&F=".urlencode($file);
+				$b.="\" TITLE=\"Checkout file for edit\">" ;
+				$b.=$gblIcon("checkout")."</A>";
+			}
 
 			if ( $ext=="" || strstr(join(" ",$gblEditable),$ext) ) {  
 				$b.="<A HREF=\"$self?A=C&D=".urlencode($relDir)."&F=".urlencode($file);
@@ -1701,7 +1656,11 @@
 	// read mime.types
 	readMime();
 
-HTTP_POST_VAR("FN");
+	if (! isset($gblPermNote)) {
+		$gblPermNote = trperm_r;
+	}
+
+	HTTP_POST_VAR("FN");
 
 	if ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") {
 		// take variables from server
@@ -1939,6 +1898,8 @@
 
 	case "UNLOCK" :  
 		if ( $CONFIRM != "on" ) break ;
+		if (! check_perm("$relDir/$FN", trperm_w))
+			Error("Access denied","User <tt>$gblLogin</tt> tried to unlock <tt>$relDir/$FN</tt> without valid trustee.",1);
 		Unlock("$fsDir/$FN");
 		break ;