--- docman.php	2002/07/27 19:27:22	1.6
+++ docman.php	2002/07/29 12:53:50	1.30
@@ -20,7 +20,7 @@
 //////////////////////////////////////////////////////////////////
 // CONFIGURATION OPTIONS
 
-// 	error_reporting(4) ;		// how verbose ?
+ 	error_reporting(E_ALL) ;		// how verbose ?
 
 	// from where to include auth_*.php modules?
 	$gblIncDir = "/data/docman2";
@@ -84,14 +84,14 @@
 	LoadLanguage($HTTP_SERVER_VARS["HTTP_ACCEPT_LANGUAGE"]);
 
 	// for security and configuration
-	$realm=$HTTP_SERVER_VARS[HTTP_HOST];
+	$realm=$HTTP_SERVER_VARS["HTTP_HOST"];
 
-	$fsDocumentRoot = dirname($HTTP_SERVER_VARS[SCRIPT_FILENAME]);
+	$fsDocumentRoot = dirname($HTTP_SERVER_VARS["SCRIPT_FILENAME"]);
 	if ($fsDocumentRoot == "") Error("Configuration error","Can't get SCRIPT_FILENAME from your web server. Please set <tt>\$fsDocumentRoot</tt> in <tt>\$</tt>",1);
 
 	// globals for later
-	$gblLogin = $HTTP_SERVER_VARS[PHP_AUTH_USER];
-	$gblPasswd = $HTTP_SERVER_VARS[PHP_AUTH_PW];
+	$gblLogin = HTTP_SERVER_VAR("PHP_AUTH_USER");
+	$gblPasswd = HTTP_SERVER_VAR("PHP_AUTH_PW");
 
 //////////////////////////////////////////////////////////////////
 
@@ -109,16 +109,15 @@
 
 function StartHTML($title,$text="") {
 
-	global $html,$fsDocumentRoot,$HTTP_SERVER_VARS;
+	global $html,$fsDocumentRoot,$gblTitle,$HTTP_SERVER_VARS;
 
-	$title = $gblTitle." ".$title ;
 	$host  = $HTTP_SERVER_VARS["HTTP_HOST"] ;
 	$self  = $HTTP_SERVER_VARS["PHP_SELF"] ;
 
 	if (file_exists("$fsDocumentRoot/docman.css")) {
 		$css=dirname($self)."/docman.css";
 	} else {
-		$css=$self."?STYLE=get&css=$css";
+		$css=$self."?STYLE=get";
 	}
 
 	include("$html/head.html");
@@ -138,20 +137,28 @@
 	} else {
 		$url .= md5($gblLogin.$gblPasswd);
 	}
-	if (isset($gblLogin) && $gblLogin != "" && ($gblPasswd == "" || !isset($gblPasswd))) {
+	if ( (  (isset($gblLogin) && $gblLogin != "") ||
+		(!isset($gblLogin) || $gblLogin == "")
+	     ) && ($gblPasswd == "" || !isset($gblPasswd))) {
 		$url_title="login";
 		$url .= "&force_login=1";
 	} else {
 		$url_title="relogin";
 	}
 	include("$html/footer.html");
+
+	global $debug;
+	if ($debug) print $debug;
 } // end function EndHTML
 
 //////////////////////////////////////////////////////////////////
 
 function DetailPage($fsRoot,$relDir,$fn) {
 	
-	global $gblEditable, $gblImages, $webRoot, $html, $HTTP_SERVER_VARS ;
+	global $gblEditable, $gblImages,
+		$gblDateFmt, $gblTimeFmt,
+		$webRoot, $html,
+		$HTTP_SERVER_VARS ;
 	$self = $HTTP_SERVER_VARS["PHP_SELF"] ;
 
 	$relPath  = $relDir . "/" . $fn ;
@@ -160,14 +167,16 @@
 
 	$exists   = file_exists($fsPath) ;
 	$ext      = strtolower(strrchr($relPath,".")) ;
-	$editable = ( $ext=="" || strstr(join(" ",$gblEditable),$ext)) ;
-	$writable = is_writeable($fsPath) ;
+	$editable = ( $ext=="" || strstr(join(" ",$gblEditable),$ext)) &&
+		check_perm($relPath,trperm_w);
+	$writable = is_writeable($fsPath) && check_perm($relPath,trperm_w) ;
+	$writable_dir = is_writeable($fsDir) && check_perm($relDir,trperm_w) ;
 	$file_lock = CheckLock($fsPath);
 
 	if (!$editable && !$exists) 
-		Error("Creation unsupported for type",$relPath) ;
-	if (!exists && !is_writeable($fsDir) )
-		Error("Creation denied",$relDir) ;
+		Error("Creation denied","Can't create <tt>$relPath</tt>") ;
+	if (!$exists && !$writable_dir )
+		Error("Creation denied","Can't write in directory <tt>$relDir</tt> while creating <tt>$relPath</tt>for which user has permissions.",1);
 
 	$text  = _("Use this page to view, modify or ") ;
 	if (is_dir($fsPath)) {
@@ -179,11 +188,12 @@
 	$title = "("._("Detail Page").")" ;
 	StartHTML($title, $text) ;
 
-	echo "<H3>" . $relDir . "/" . $fn . "</H3>" ;
+	print "<H3>".$relDir.$fn."</H3>";
+
 	if ($exists) {  // get file info
 		$fsize = filesize($fsPath) ; 
-		$fmodified = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", filemtime($fsPath)) ;
-		$faccessed = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", fileatime($fsPath)) ;
+		$fmodified = date("$gblDateFmt $gblTimeFmt", filemtime($fsPath)) ;
+		$faccessed = date("$gblDateFmt $gblTimeFmt", fileatime($fsPath)) ;
 		$fuid=fileowner($fsPath);
 		$fgid=filegroup($fsPath);
 		$userinfo = posix_getpwuid($fuid);
@@ -200,7 +210,7 @@
 		$fstr = htmlentities( $fstr ) ;
 ?>
 
-<FORM ACTION="<?= $self ; ?>" METHOD="POST">
+<FORM ACTION="<?= $self ?>" METHOD="POST">
 <SPAN TITLE="Click [SAVE] to store updated contents.">
 	<B>DOCUMENT CONTENTS</B>
 </SPAN><BR>
@@ -220,7 +230,7 @@
 	}
 	if ( !$file_lock && $ext!="" && strstr(join(' ',$gblImages),$ext) ) {  
 		$info  = getimagesize($fsPath) ;
-		$tstr = "<IMG SRC=\"$webRoot".urlpath($relPath)."\" BORDER=0 " ;
+		$tstr = "<IMG SRC=\"$self?A=V&D=".urlpath(dirname($relPath))."&F=".urlpath(basename($relPath))."\" BORDER=0 " ;
 		$tstr .= $info[3] . " ALT=\"" . $fn . " - " ;
 		$tstr .= (int)(($fsize+1023)/1024) . "Kb\">" ;
 //		echo htmlentities($tstr) . "<BR><BR>" . $tstr ;
@@ -471,18 +481,10 @@
 
 //////////////////////////////////////////////////////////////////
 
-function GifIcon($txt) {
-	global $gblIconLocation ;
+function GifIcon($txt = "") {
+	global $gblIconLocation, $gblImages ;
 
 	switch (strtolower($txt)) {
-	case ".bmp" :
-	case ".gif" :
-	case ".jpg" :
-	case ".jpeg":
-	case ".tif" :
-	case ".tiff": 
-		$d = "image2.gif" ;
-		break ;
 	case ".doc" :
 		$d = "layout.gif" ;
 		break ;
@@ -560,9 +562,14 @@
 		$d = "quill.gif";
 		break;
 	default :
-		$d = "generic.gif" ;
+		if (in_array(strtolower($txt),$gblImages)) {
+			$d = "image2.gif" ;
+		} else {
+			$d = "generic.gif" ;
+		}
 	}
 
+
 	return "<IMG SRC=\"$gblIconLocation" . $d . "\" BORDER=0>" ;
 } // end function GifIcon
 
@@ -571,19 +578,31 @@
 function Navigate($fsRoot,$relDir) {
 
 	global $gblEditable, $gblIcon, $gblModDays, $webRoot, $gblHide,
-		$gblIgnoreUnknownFileType,
-		$HTTP_GET_VARS, $html, $realm_config;
-
+		$gblIgnoreUnknownFileType, $gblRepositoryDir,
+		$gblLogin, $gblUserName, $gblDateFmt, $gblTimeFmt,
+		$fsRealmDir, $realm, $realm_sep,
+		$html, $realm_config,
+		$HTTP_GET_VARS, $HTTP_SERVER_VARS;
+	
 	$self     = $HTTP_SERVER_VARS["PHP_SELF"] ;
 
-	if ($relDir == "") $relDir = "/";
+	$relDir = chopsl($relDir)."/";
+	$fsDir = $fsRoot.$relDir;	// current directory
+
+	if (!is_dir($fsDir)) Error("Dir not found","Directory <tt>$relDir<tt> not found on filesystem at <tt>$fsDir</tt>",1) ; 
 
-	$fsDir = $fsRoot.$relDir."/";	// current directory
+	global $debug;
+	$debug .= "[$gblLogin|$relDir] before >";
 
-	if (!is_dir($fsDir)) Error("Dir not found",$relDir) ; 
+	if (! check_perm($relDir,trperm_b))
+		Error("Access denied","User <tt>$gblLogin</tt> tried to access <tt>$relDir</tt> without valid trustee.",1);
+	$debug .= "< afeter";
 
 	$hide_items=",$gblHide,";
 
+	$dirList = array();
+	$fileList = array();
+
 	// read directory contents
 	if ( !($dir = @opendir($fsDir)) ) 
 		Error("Read Access denied",$relDir,1) ;
@@ -608,13 +627,18 @@
 	closedir($dir) ; 
 
 	// scan deleted files
-	if ( $HTTP_GET_VARS["show_deleted"] == 1 && ($dir = @opendir("$fsDir/.del")) ) {
+	if ( HTTP_GET_VAR("show_deleted") == 1 && ($dir = @opendir("$fsDir/.del")) ) {
 		while ($item = readdir($dir)) {
 			if ( substr($item,0,1) == "." || strstr($hide_items,",$item,") || !check_perm($relDir.$item,trperm_w) ) continue ;
-			$fileList[$item] = ".del/$item" ;		
-			$fileDate[$item] = filemtime($fsDir.".del/$path") ;
-			$fileSize[$item] = filesize($fsDir.".del/$path") ;
-			$fileNote[$item] = ReadNote($fsDir.".del/$item");
+			if (is_file($fsDir.".del/$item")) {
+				$fileList[$item] = ".del/$item" ;		
+				$fileDate[$item] = filemtime($fsDir.".del/$item") ;
+				$fileSize[$item] = filesize($fsDir.".del/$item") ;
+				$fileNote[$item] = ReadNote($fsDir.".del/$item");
+			} else {
+				$dirList[$item] = ".del/$item" ;		
+				$dirNote[$item] = ReadNote($fsDir.".del/$item");
+			}
 		}
 		closedir($dir) ; 
 	}
@@ -623,7 +647,7 @@
 
 	// start navigation page
 	$text  = "Use this page to add, delete";
-	if (! isset($HTTP_GET_VARS[show_deleted])) {
+	if (! isset($HTTP_GET_VARS["show_deleted"])) {
 		$text .= ", <a href=$self?D=".urlencode($relDir)."&show_deleted=1>undelete</a>";
 	}
 	$text .= " or revise files on this web site." ;
@@ -633,7 +657,7 @@
 	echo "<TABLE BORDER=0 CELLPADDING=2 
 		CELLSPACING=3 WIDTH=\"100%\">" ;
 
-	// updir bar	
+	// updir (parent) bar	
 	if (chopsl($fsDir) != chopsl($fsRoot)) {
 		$parent = dirname($relDir) ;
 		if ($parent == "") $parent = "/" ;
@@ -649,8 +673,7 @@
 		return $out;
 	}
 
-	$dsort = $HTTP_GET_VARS[dsort];
-	if (! isset($dsort)) $dsort = "name";	// default directory sort
+	if (! HTTP_GET_VAR("dsort")) $dsort = "name"; // default directory sort
 
 	$dsort_arr = array(
 		"name" => array ("rname", "note"),
@@ -659,8 +682,7 @@
 		"rnote" => array ("name", "note")
 		);
 
-	$fsort = $HTTP_GET_VARS[fsort];
-	if (! isset($fsort)) $fsort = "name";	// default directory sort
+	if (! HTTP_GET_VAR("fsort")) $fsort = "name"; // default directory sort
 
 	$fsort_arr = array(
 		"name" => array ("rname", "note", "date", "size"),
@@ -676,6 +698,7 @@
 	$D="D=".urlencode($relDir);
 
 	function self_args($arr = array()) {
+		global $self;
 		$arg = implode("&",$arr);
 		if ($arg) {
 			return $self."?".$arg;
@@ -713,7 +736,14 @@
 			$dir = $dirList[$key];
 
 			$info_url=self_args(array("A"=>"A=E", "F"=>"F=".urlencode($dir), "D"=>$D));
-			$dir_url=$self."?D=".urlencode($relDir."/".$dir);
+			if (substr($dir,0,5) == ".del/") {
+				$dir = substr($dir,5,strlen($dir)-5);
+				$deleted = " <a href=\"$info_url#undelete\"><SPAN CLASS=deleted TITLE=\"deleted\">deleted</span></a>";
+			} else {
+				$deleted = "";
+			}
+	
+			$dir_url=$self."?D=".urlencode(chopsl($relDir)."/".$dir);
 			include("$html/Navigate-dirEntry.html");
 
 		}  // iterate over dirs
@@ -791,7 +821,7 @@
 		if (substr($file,0,5) != ".del/") {
 			$file_url_html .= $file . "</A>" . $a ;
 		} else {
-			$file_url_html .= substr($file,5,strlen($file)-5) . "</a> <SPAN CLASS=RED TITLE=\"deleted\"> <a href=\"$info_url#undelete\">deleted</a> </span>";
+			$file_url_html .= substr($file,5,strlen($file)-5) . "</a> <a href=\"$info_url#undelete\"><SPAN CLASS=deleted TITLE=\"deleted\">deleted</span></a>";
 		}
 
 		$note_html="<a href=\"$info_url#note\">".$gblIcon("note")."</a>".ReadNote($path);
@@ -799,7 +829,7 @@
 		$ext = strtolower(strrchr($file,".")) ;
 
 		if ($file_lock) {
-			if ($file_lock == $GLOBALS[gblUserName]) {
+			if ($file_lock == $gblUserName) {
 				$b.="<A HREF=\"$self?A=Ci&D=".urlencode($relDir)."&F=".urlencode($file);
 				$b.="\" TITLE=\"Checkin (update) file on server\">" ;
 				$file_url_html=$b;
@@ -827,7 +857,7 @@
 			}
 		}
 
-		$mod = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]",$mod);
+		$mod = date("$gblDateFmt $gblTimeFmt",$mod);
 
 		include("$html/Navigate-fileEntry.html");
 
@@ -859,12 +889,18 @@
 <TR><TD></TD><TD COLSPAN=5><HR></TD></TR>
 
 <?
-if (file_exists(".info.inc")) {
+
+if (file_exists("$fsRealmDir/$realm".$realm_sep."info.inc")) {
+	print "<TR><TD></TD><TD COLSPAN=5>";
+	include("$fsRealmDir/$realm".$realm_sep."info.inc");
+	print "</TD></TR><TR><TD></TD><TD COLSPAN=5><HR></TD></TR>";
+} elseif (file_exists("$gblRepositoryDir/.info.inc")) {
 	print "<TR><TD></TD><TD COLSPAN=5>";
-	include(".info.inc");
-	print "</TD></TR>
-	<TR><TD></TD><TD COLSPAN=5><HR></TD></TR>";
+	include("$gblRepositoryDir/.info.inc");
+	print "</TD></TR><TR><TD></TD><TD COLSPAN=5><HR></TD></TR>";
 }
+
+
 ?>
 
 <FORM METHOD="POST" ACTION="<?= $self ?>">
@@ -892,8 +928,6 @@
 	global $html, $HTTP_SERVER_VARS;
 
 	$self = $HTTP_SERVER_VARS["PHP_SELF"] ;
-	if ($relDir == "") $relDir = "/" ; 
-
 	include("$html/UploadPage.html");
 
 } // end function UploadPage
@@ -903,11 +937,11 @@
 // Error with sysadmin flag are reported to error_log or hidden from
 // users
 
-function Error($title,$text="",$sysadmin=0) {
+function Error($title,$text="",$sysadmin=0,$no_404=0) {
 	global $gblSeparateAdminMessages,
 		$gblMailAdminMessages,$realm,
 		$HTTP_SERVER_VARS;
-	if (! headers_sent()) header("HTTP/1.0 404 Not Found");
+	if (! headers_sent() && ! $no_404) header("HTTP/1.0 404 Not Found");
 	if ($sysadmin) {
 		if ($gblSeparateAdminMessages) {
 			$user="Your administrator ";
@@ -935,6 +969,8 @@
 
 function LogIt($target,$msg, $changelog=0) {
 
+	global $gblDateFmt, $gblTimeFmt, $gblUserName, $gblFsRoot;
+
 	$dir=dirname($target);
 	if (! file_exists($dir."/.log")) {
 		if (! @mkdir($dir."/.log",0700)) Error("docman installation problem","can't create log directory <tt>$dir/.log</tt>",1);
@@ -942,18 +978,17 @@
 	$file=basename($target);
 
 	$log=fopen("$dir/.log/$file","a+");
-	fputs($log,date("$GLOBALS[gblDateFmt]\t$GLOBALS[gblTimeFmt]").
-		"\t$GLOBALS[gblUserName]\t$msg\n");
+	fputs($log,date("$gblDateFmt\t$gblTimeFmt").
+		"\t$gblUserName\t$msg\n");
 	fclose($log);
 
 	if (! $changelog) return;
 
-	global $gblFsRoot;
 	$log=fopen("$gblFsRoot/.changelog","a+");
 	if (substr($target,0,strlen($gblFsRoot)) == $gblFsRoot)
 		$target=substr($target,strlen($gblFsRoot),strlen($target)-strlen($gblFsRoot));
 	$msg=str_replace("\t"," ",$msg);
-	fputs($log,time()."\t$target\t$GLOBALS[gblUserName]\t$msg\n");
+	fputs($log,time()."\t$target\t$gblUserName\t$msg\n");
 	fclose($log);
 
 	// FIX: implement e-mail notification based on $changelog
@@ -973,6 +1008,9 @@
 	$file=basename($target);
 
 	$note=fopen("$dir/.note/$file","w");
+	if (! $note) {
+		Error("Error writing note","Can't open note file <tt>$dir/.note/$file</tt> for writing",1);
+	}
 	fputs($note,"$msg\n");
 	fclose($note);
 
@@ -1013,6 +1051,8 @@
 
 function Lock($target) {
 
+	global $gblUserName;
+
 	$target=stripSlashes($target);
 	$dir=dirname($target);
 	if (! file_exists($dir."/.lock")) {
@@ -1024,7 +1064,7 @@
 		LogIt($target,"attempt to locked allready locked file!");
 	} else {
 		$lock=fopen("$dir/.lock/$file","w");
-		fputs($lock,"$GLOBALS[gblUserName]\n");
+		fputs($lock,"$gblUserName\n");
 		fclose($lock);
 
 		LogIt($target,"file locked");
@@ -1073,16 +1113,21 @@
 //////////////////////////////////////////////////////////////////
 
 function safe_rename($fromdir,$fromfile,$tofile) {
+
+	global $gblNumBackups;
+
 	function try_rename($from,$to) {
 #		print "$from -> $to\n";
 		if (file_exists($from) && is_writeable(dirname($to))) {
-			rename($from,$to);
+			return rename($from,$to);
+		} else {
+			return 0;
 		}
 	}
 
 	function try_dir($todir) {
 		if (! file_exists($todir)) {
-			mkdir($todir,0700);
+			@mkdir($todir,0700);
 	        }
 	}
 
@@ -1092,7 +1137,7 @@
 
 #	print "<pre>$fromdir / $fromfile -> $todir / $tofile\n\n";
 
-	try_rename("$fromdir/$fromfile","$todir/$tofile");
+	if (! try_rename("$fromdir/$fromfile","$todir/$tofile")) Error("Rename error","Can't rename file <tt>$fromfile</tt> to <tt>$tofile</tt>",1);
 	try_dir("$todir/.log");
 	try_rename("$fromdir/.log/$fromfile","$todir/.log/$tofile");
 	try_dir("$todir/.note");
@@ -1100,7 +1145,7 @@
 	try_dir("$todir/.lock");
 	try_rename("$fromdir/.lock/$fromfile","$todir/.lock/$tofile");
 	try_dir("$todir/.bak");
-	for($i=0;$i<=$GLOBALS[gblNumBackups];$i++) {
+	for($i=0;$i<=$gblNumBackups;$i++) {
 		try_rename("$fromdir/.bak/$i/$fromfile","$todir/.bak/$i/$tofile");
 	}
 }
@@ -1128,7 +1173,10 @@
 
 function DisplayChangeLog($day) {
 
-	global $gblFsRoot,$HTTP_SERVER_VARS;
+	global $gblFsRoot, $gblDateFmt, $gblTimeFmt,
+		$HTTP_SERVER_VARS;
+
+	$self  = $HTTP_SERVER_VARS["PHP_SELF"];
 
 	if (!file_exists("$gblFsRoot/.changelog")) return;
 	$log=fopen("$gblFsRoot/.changelog","r");
@@ -1147,14 +1195,14 @@
 	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]);
+		$date = date($gblDateFmt, $e[0]);
+		$time = date($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=\"$HTTP_SERVER_VARS[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=$HTTP_SERVER_VARS[PHP_SELF]>front page</a>.</p>";
+	print "<p>".GifIcon("up")." Back to <a href=\"$self\">front page</a>.</p>";
 }
 
 //////////////////////////////////////////////////////////////////
@@ -1176,7 +1224,7 @@
 
 	$ext_arr = explode(".",$file);
 	$ext = array_pop($ext_arr);
-	if ($encoding_ext[$ext]) {
+	if (isset($encoding_ext[$ext])) {
 		$encoding = $encoding_ext[$ext];
 		$ext = array_pop($ext_arr);
 	}
@@ -1188,7 +1236,7 @@
 	}
 
 	// IE5.5 just downloads index.php if we don't do this
-	if(preg_match("/MSIE 5.5/", $HTTP_SERVER_VARS[HTTP_USER_AGENT])) {
+	if(preg_match("/MSIE 5.5/", $HTTP_SERVER_VARS["HTTP_USER_AGENT"])) {
 		header("Content-Disposition: filename=$file");
 	} else {
 		header("Content-Disposition: attachment; filename=$file");
@@ -1203,8 +1251,8 @@
 //////////////////////////////////////////////////////////////////
 
 function chopsl($path) {
-	if (substr($path,strlen($path)-1,1) == "/") $path=substr($path,0,strlen($path)-1);
 	$path=str_replace("//","/",$path);
+	if (substr($path,strlen($path)-1,1) == "/") $path=substr($path,0,strlen($path)-1);
 	return $path;
 }
 
@@ -1218,16 +1266,16 @@
 	by Vyacheslav Zavadsky <zavadsky@braysystems.com>
 */
 
-define(trmask_not,1 << 0);
-define(trmask_clear,1 << 1);
-define(trmask_deny,1 << 2);
-define(trmask_one_level,1 << 3);
-define(trmask_group,1 << 4);
-
-define(trperm_r,1 << 5);
-define(trperm_w,1 << 6);
-define(trperm_b,1 << 7);
-define(trperm_n,1 << 8);
+define('trmask_not',1 << 0);
+define('trmask_clear',1 << 1);
+define('trmask_deny',1 << 2);
+define('trmask_one_level',1 << 3);
+define('trmask_group',1 << 4);
+
+define('trperm_r',1 << 5);
+define('trperm_w',1 << 6);
+define('trperm_b',1 << 7);
+define('trperm_n',1 << 8);
 
 $trustee_a2n = array(
 	'!' => trmask_not,
@@ -1275,7 +1323,7 @@
 	$error="<tt>".dirname($trustee_php)."</tt> must be writable by web server user";
 } elseif (file_exists($trustee_php) && !is_writable($trustee_php)) {
 	$error="trustees cache file <tt>$trustee_php</tt> exists, but is not writable by web server";
-} elseif (1 || filemtime($trustee_conf) >= filemtime($trustee_php)) {
+} elseif (@filemtime($trustee_conf) >= @filemtime($trustee_php)) {
 	$fp_php=@fopen($trustee_php,"w");
 	fputs($fp_php,"<?php // don't edit by hand!\n");
 
@@ -1311,7 +1359,11 @@
 						$error.="trustee error in line '$l' [Unknown modifier '$ch']<br>\n";
 					}
 				}
-				$tr_arr[$path][$user] |= $perm;
+				if (isset($tr_arr[$path][$user])) {
+					$tr_arr[$path][$user] |= $perm;
+				} else {
+					$tr_arr[$path][$user] = $perm;
+				}
 			}
 		}
 	}
@@ -1350,10 +1402,10 @@
 	fclose($fp_php);
 }
 
-if ($error) {
+if (isset($error)) {
 	Error("Trustee error",$error,1);
 } else {
-	include("$trustee_php");
+	include_once("$trustee_php");
 }
 
 return 1;
@@ -1361,67 +1413,85 @@
 }//init_trustee
 
 function in_group($user,$group) {
-	return in_array($groups[$group],$user);
+	global $groups;
+	return in_array($user,$groups[$group]);
 }
 
 // helper function
-function unroll_perm($u,$t,$user,$perm) {
-	// check user
-	if ($t & trmask_not && ($u==$user)) continue;
-	if (!($t & trmask_not) && ($u!=$user)) continue;
+function unroll_perm($u,$t,$perm,$one_level) {
+
+	if ($t & trmask_one_level && !$one_level) return $perm;
 
 	if ($t & trmask_deny) {
 		if ($t & trmask_clear) {
-			$perm[deny] &= ~$t;
+			$perm['deny'] &= ~$t;
 		} else {
-			$perm[deny] |= $t;
+			$perm['deny'] |= $t;
 		}
 	} elseif ($t & trmask_clear) {
-		$perm[allow] &= ~$t;
+		$perm['allow'] &= ~$t;
 	} else {
-		$perm[allow] |= $t;
+		$perm['allow'] |= $t;
 	}
 	return $perm;
 }// end of helper function
 
 function check_trustee($user,$path) {
-	global $trustees;
-	$perm[allow] = 0;
-	$perm[deny] = 0;
+	global $trustees,$HAVE_TRUSTEE;
+	$perm['allow'] = 0;
+	$perm['deny'] = 0;
+
+	// do we use trustees?
+	if (! $HAVE_TRUSTEE) return $perm;
+
+	if (! isset($trustees)) Error("Trustees not found","Can't find in-memory trustee structure <tt>\$trustees</tt>. Probably bug in code. Contact <tt>dpavlin@rot13.org</tt>",1);
+
+global $debug;
+$debug .= "<br>check_trustee $path ... ";
+
 	$path_arr=explode("/",$path);
-	$path = "/";
+	$tmppath = "/";
 	while (count($path_arr)) {
-		if (substr($path,strlen($path)-1,1) != "/") $path.="/";
-		$path.=array_shift($path_arr);
-		$tr = $trustees[$path];
+		$tmppath.=array_shift($path_arr);
+$debug.= ">> $tmppath ";
+
+		if (! isset($trustees[$tmppath])) continue;
+		$tr = $trustees[$tmppath];
+
+		$one_level = (!count($path_arr));
+$debug.=" O($one_level) ";
 
 		if (isset($tr)) {
 			// first apply trustee for all
-			if (isset($tr['*'])) {
-				$perm = unroll_perm($user,$tr['*'],$user, $perm);
+			if (isset($tr['*']) && $user!="anonymous") {
+				$perm = unroll_perm($user,$tr['*'],$perm, $one_level);
 				unset($tr['*']);
 			}
-			// then apply group policies
-			foreach ($tr as $u=>$t) {
-				if ($t & trmask_group && in_group($user,$u)) {
+			// then apply not and group policies
+			foreach ($tr as $g=>$t) {
+				if ($t & trmask_not && $g != $user) {
+					$t = $t & ~trmask_not;
+					$perm = unroll_perm($user,$t,$perm, $one_level);
+					unset($tr[$g]);
+
+				} elseif ($t & trmask_group && in_group($user,$g)) {
 					// resolv user
 					$t = $t & ~trmask_group;
-					$u = $user;
-					$perm = unroll_perm($u,$t,$user, $perm);
-					unset($tr[$u]);
+					$perm = unroll_perm($user,$t,$perm, $one_level);
+					unset($tr[$g]);
 				}
 			}
-			// then apply use policy
+			// then apply user policy
 			if (isset($tr[$user])) {
-				$perm = unroll_perm($user,$tr[$user],$user, $perm);
+				$perm = unroll_perm($user,$tr[$user],$perm,$one_level);
 				unset($tr[$user]);
 			}
-
 		}
+$debug.="d(".display_trustee($perm['deny']).") a(".display_trustee($perm['allow']).") ";
 
 	}
-#print "<br>user: $user path: $path perm: ";
-#print "d: $perm[deny] (".display_trustee($perm[deny]).") a: $perm[allow] (".display_trustee($perm[allow]).")<Br>\n";
+$debug.="<br>check_trustee: user: $user path: $path==$tmppath perm: ";
+$debug.="d: ".$perm['deny']." (".display_trustee($perm['deny']).") a: ".$perm['allow']." (".display_trustee($perm['allow']).")<Br>\n";
 	return $perm;
 }
 
@@ -1429,15 +1499,20 @@
 
 function check_perm($path,$trperm) {
 	global $gblLogin,$HAVE_TRUSTEE;
-print "<br>check_perm: <tt>$path</tt> test perm ".display_trustee($perm)."<br>\n";
+
+	$path = str_replace("//","/",$path);
+
+	global $debug;
+$debug.="<br>check_perm: on <tt>$path</tt> for perm ".display_trustee($trperm)."<br>\n";
+
 	$return = ! $HAVE_TRUSTEE;
 	if ($HAVE_TRUSTEE) {
 		$perm = check_trustee($gblLogin,$path);
-print " d: $perm[deny] (".display_trustee($perm[deny]).") a: $perm[allow] (".display_trustee($perm[allow]).") perm: $trperm";
-		if ($perm[deny] & $trperm) $return=0;
-		elseif ($perm[allow] & $trperm) $return=1;
+$debug.=" d: ".$perm['deny']." (".display_trustee($perm['deny']).") a: ".$perm['allow']." (".display_trustee($perm['allow']).") perm to have: $trperm (".display_trustee($trperm).")";
+		if ($perm['deny'] & $trperm) $return=0;
+		elseif (($perm['allow'] & $trperm) == $trperm) $return=1;
 	}
-print " return: $return<br>\n";
+$debug.=" return: $return<br>\n";
 	return($return);
 }
 
@@ -1467,12 +1542,70 @@
 }
 
 //////////////////////////////////////////////////////////////////
+
+// check for invalid characters in filename and dirname (.. and /)
+
+function check_dirname($file) {
+	if (strstr($file,"..")) Error("Security violation","No parent dir <tt>..</tt> allowed in directory name <tt>$file</tt>",1);
+}
+
+function check_filename($file) {
+	if (strstr($file,"..")) Error("Security violation","No parent dir <tt>..</tt> allowed in file name <tt>$file</tt>",1);
+	// remove deleted directory (for undelete to work)
+	$file = str_replace(".del/","",$file);
+	if (strstr($file,"/")) Error("Security violation","No slashes <tt>/</tt> allowed in file name <tt>$file</tt>",1);
+}
+
+// bla/blo/../foo will return bla/foo
+function remove_parent($path) {
+	while (preg_match(",/[^/]+/\.\./,",$path)) {
+		$path = preg_replace(",/[^/]+/\.\./,","",$path);
+	}
+	if (substr($path,0,1) != "/") $path = "/".$path;
+	return $path;
+}
+
+//////////////////////////////////////////////////////////////////
+
+// functions to move HTTP server variables to global namespace
+// [replacement for register_globals in php.ini]
+
+function HTTP_GET_VAR($var) {
+	global $HTTP_GET_VARS, ${$var};
+	if (isset($HTTP_GET_VARS[$var])) {
+		$$var = stripSlashes($HTTP_GET_VARS[$var]);
+		return $$var;
+	}
+}
+
+function HTTP_POST_VAR($var) {
+	global $HTTP_POST_VARS, ${$var};
+	if (isset($HTTP_POST_VARS[$var])) {
+		$$var = $HTTP_POST_VARS[$var];
+		return $$var;
+	}
+}
+
+function HTTP_SERVER_VAR($var) {
+	global $HTTP_SERVER_VARS, ${$var};
+	if (isset($HTTP_SERVER_VARS[$var])) {
+		$$var = $HTTP_SERVER_VARS[$var];
+		return $$var;
+	}
+}
+
+//////////////////////////////////////////////////////////////////
+
+function Warn($text) {
+}
+
+//////////////////////////////////////////////////////////////////
 // MAIN PROGRAM
 
 	$gblFilePerms = 0640 ;         // default for new files
 	$gblDirPerms  = 0750 ;		// default for new dirs
 
-	if (isset($STYLE) && $STYLE == "get") {
+	if (isset($HTTP_GET_VARS["STYLE"]) && $HTTP_GET_VARS["STYLE"] == "get") {
 		include("$html/docman.css");
 		exit;
 	}
@@ -1480,7 +1613,7 @@
 	// location of master docman configuration file
 	$docman_conf = "/etc/docman.conf";
 	if (! file_exists($docman_conf)) {
-		$error = "Can't find master configuration file $docman_conf. See docman2/doc/upgrade.html#docman_conf for more informations";
+		$error = "Can't find master configuration file <tt>$docman_conf</tt>. See <tt>docman2/doc/upgrade.html#docman_conf</tt> for more informations";
 		
 		error_log("docman: $error");
 		Error("docman not installed completly",$error);
@@ -1490,7 +1623,16 @@
 	if (! isset($fsRealmDir)) {
 		$fsRealmDir = "$gblIncDir/realm";
 	}
-	$realm_config = "$fsRealmDir/$realm.conf";
+
+	// try to add dir to script name to realm var
+	if (is_dir("$fsRealmDir/$realm/".dirname($HTTP_SERVER_VARS["SCRIPT_NAME"]))) {
+		$realm .= dirname($HTTP_SERVER_VARS["SCRIPT_NAME"]);
+		$realm_sep = "/";
+	} else {
+		$realm_sep = ".";
+	}
+
+	$realm_config = $fsRealmDir."/".$realm.$realm_sep."conf";
 
 	// read user-defined configuration
 	if (file_exists($realm_config)) {
@@ -1508,6 +1650,10 @@
 		Error("Configuration error","Can't find user handling module at <tt>$gblIncDir/htusers/$gblUsers.php</tt> ! Please fix <tt>$realm_config</tt>");
 	}
 
+	// take additional login vars
+	HTTP_GET_VAR("relogin");
+	HTTP_GET_VAR("force_login");
+
 	// if no password, or empty password logout
 	if (
 		isset($gblLogin) && (
@@ -1526,17 +1672,18 @@
 	if (!is_dir($gblRepositoryDir)) Error("Repository dir not found","Can't find repository directory <tt>$gblRepositoryDir</tt>. Please fix that in <tt>$realm_config</tt> variable <tt>\$gblRepositoryDir</tt>.",1);
 
 	// trustee (ACL) file configuration
-	$trustee_conf="$gblIncDir/realm/$realm.trustee";
+	$trustee_conf="$fsRealmDir/$realm".$realm_sep."trustee";
 	// compiled version of trustee file
 	$trustee_php="$gblRepositoryDir/.trustee.php";
 	// get ACL informations
 	$HAVE_TRUSTEE = init_trustee();
 
-	if (strtolower($gblLogin) == "anonymous" || !isset($gblPasswd)) {
-		$perm = check_trustee($gblLogin,$path);
+	if (strtolower($gblLogin) == "anonymous" || !isset($gblLogin)) {
+		$perm = check_trustee("anonymous","/");
 		// browsing must be explicitly allowed for root directory
 		// of repository for anonymous user to work!
-		if ($perm[allow] & trperm_b) {
+		if ($perm['allow'] & trperm_b) {
+			$gblLogin = $gblPasswd = "anonymous";
 			$secHash = md5($gblLogin.$gblPasswd);
 			$gblUserName = "Anonymous user";
 		}
@@ -1547,39 +1694,54 @@
 		isset($relogin) && $secHash == $relogin) {
 		header("WWW-authenticate: basic realm=\"$realm\"") ;
 		header("HTTP/1.0 401 Unauthorized") ;
-		Error("401 Unauthorized","No trespassing !");
+		Error("401 Unauthorized","No trespassing !",0,1);
 	}
 
+
 	// read mime.types
 	readMime();
 
-	// get current directory relative to $gblFsRoot 
-	$relDir = $DIR ;	// from POST
-	if ($relDir == "") {	// not defined in POST ? 
-		$relDir = urldecode($D) ;  // then use GET
-	}	
-
-	$relDir=stripSlashes($relDir);
-
-	if ($relDir == "/") $relDir = "" ; 	
-	// default : website root = ""
-
-	if (strstr($relDir,"..")) Error("No updirs allowed");
+HTTP_POST_VAR("FN");
 
-	// full paths contain "fs" or "Fs". Paths realitve to root of
-	// website contain "rel" or "Rel". The script won't let you 
-	// edit anything above directory equal to http://server.com 
-	// i.e. below $gblFsRoot.
+	if ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") {
+		// take variables from server
+		if (HTTP_POST_VAR("FN"))
+			check_filename($FN);
+		if (HTTP_POST_VAR("DIR")) {
+			check_dirname($DIR);
+			$relDir = $DIR;
+		} else {
+			trigger_error("Can't get DIR",E_USER_WARNING);
+			$relDir = "/";
+		}
+		if (HTTP_POST_VAR("RELPATH")) check_dirname($RELPATH);
+		HTTP_POST_VAR("T");
+		HTTP_POST_VAR("CONFIRM");
+	} else {
+		// get
+		HTTP_GET_VAR("A");
+		if (HTTP_GET_VAR("D")) {
+			check_dirname($D);
+			$D=urldecode($D);
+			$relDir = $D;
+		} else {
+			//trigger_error("Can't get D",E_USER_WARNING);
+			$relDir = "/";
+		}
+		if (HTTP_GET_VAR("F")) check_filename($F);
+	}
 
-	$relScriptDir = dirname($SCRIPT_NAME) ;  	
+	$relScriptDir = dirname($HTTP_SERVER_VARS["SCRIPT_NAME"]) ;  	
 	// i.e. /docman
 
 	// start on server root
 	$gblFsRoot = $gblRepositoryDir;
-	// i.e. /home/httpd/html
+	// i.e. /home/httpd/repository
 
 	$fsDir = $gblFsRoot . $relDir ; // current directory
-	if ( !is_dir($fsDir) ) Error("Dir not found",$relDir) ;
+	if ( !is_dir($fsDir) ) Error("Dir not found","Can't find <tt>$relDir</tt> which points to <tt>$fsDir</tt>",1) ;
+
+	if ($relDir == "") $relDir="/";
 
 	if (isset($HTTP_SERVER_VARS["HTTPS"]) && $HTTP_SERVER_VARS["HTTPS"] == "on") {
 		$webRoot  = "https://";
@@ -1588,50 +1750,38 @@
 	}
 	$webRoot .= $HTTP_SERVER_VARS["HTTP_HOST"] . $relScriptDir;
 
-	// take variables from server
-	$FN=stripSlashes($HTTP_POST_VARS["FN"]);
-	$DIR=stripSlashes($HTTP_POST_VARS["DIR"]);
-	$RELPATH=stripSlashes($HTTP_POST_VARS["RELPATH"]);
-	$T=stripSlashes($HTTP_POST_VARS["T"]);
-	$CONFIRM=stripSlashes($HTTP_POST_VARS["CONFIRM"]);
-
-	// get
-	$A=stripSlashes($HTTP_GET_VARS["A"]);
-	$D=stripSlashes($HTTP_GET_VARS["D"]);
-
-//	if (isset($F)) Error("Document manager system error","variable $F shouldn't be set here (re-check old code)",1);
-//	$F=stripSlashes($HTTP_SERVER_VARS["PATH_INFO"]);
-	$F=stripSlashes($HTTP_GET_VARS["F"]);
-
-	switch ($HTTP_POST_VARS["POSTACTION"]) {
+	if (HTTP_POST_VAR("POSTACTION")) switch ($POSTACTION) {
 	case "UPLOAD" :
 		$FN_name=stripSlashes($HTTP_POST_FILES["FN"]["tmp_name"]);
+		$FN=stripSlashes($HTTP_POST_FILES["FN"]["name"]);
 		if (!is_writeable($fsDir)) Error("Write denied",$relDir) ;
-		if (strstr($FN_name,"/")) 
-			Error("Non-conforming filename") ;
-		// TODO : should rather check for escapeshellcmds
-		// but maybe RFC 18xx asserts safe filenames ....
+
 		$source = $FN_name ;
 		if (! file_exists($source)) {
 			Error("You must select file with browse to upload it!");
 		}
-		$FILENAME = $HTTP_POST_VARS["FILENAME"];
+
+		if (HTTP_POST_VAR("FILENAME")) check_filename($FILENAME);
+
 		if (! isset($FILENAME)) { 	// from update file
-			$target = "$fsDir/$FN_name" ;
+			$target = "$fsDir/".basename($FN);
 		} else {
 			$target = "$fsDir/$FILENAME";
 		}
 
+		if (! check_perm("$relDir/".basename($target), trperm_w))
+			Error("Access denied","User <tt>$gblLogin</tt> tried to upload <tt>$relDir/".basename($target)."</tt> without valid trustee.",1);
+
 		// backup old files first
 		$dir=dirname($target);
 		if (! file_exists($dir."/.bak")) {
 			mkdir($dir."/.bak",0700);
 		}
-		if (! file_exists($dir."/.bak/$GLOBALS[gblNumBackups]")) {
-			mkdir($dir."/.bak/$GLOBALS[gblNumBackups]",0700);
+		if (! file_exists($dir."/.bak/$gblNumBackups")) {
+			mkdir($dir."/.bak/$gblNumBackups",0700);
 		}
 		$file=basename($target);
-		for($i=$GLOBALS[gblNumBackups]-1;$i>0;$i--) {
+		for($i=$gblNumBackups-1;$i>0;$i--) {
 			MoveTo("$dir/.bak/$i/$file","$dir/.bak/".($i+1)."/");
 		}
 		MoveTo($target,$dir."/.bak/1/");
@@ -1650,14 +1800,18 @@
 	case "SAVE" :
 		$path = $gblFsRoot . $RELPATH ;
 		$path=stripSlashes($path);
+
+		if (! check_perm("$RELPATH", trperm_w))
+			Error("Access denied","User <tt>$gblLogin</tt> tried to save <tt>$RELPATH</tt> without valid trustee.",1);
+
 		$writable = is_writeable($path) ;
 		$legaldir = is_writeable(dirname($path)) ;
 		$exists   = (file_exists($path)) ? 1 : 0 ; 
-// check for legal extension here as well
+		// FIX: more verbose error message
 	 	if (!($writable || (!$exists && $legaldir))) 
 			Error("Write denied",$RELPATH) ;
 		$fh = fopen($path, "w") ;
-		$FILEDATA=stripSlashes($FILEDATA);
+		HTTP_POST_VAR("FILEDATA");
 		fwrite($fh,$FILEDATA) ;
 		fclose($fh) ;
 		clearstatcache() ;
@@ -1666,10 +1820,18 @@
 
 	case "CREATE" :
 		// we know $fsDir exists
-		if ($FN == "") break;		// no filename!
-		if (!is_writeable($fsDir)) Error("Write denied",$relDir) ;
-		$path = $fsDir . "/" . $FN ;  // file or dir to create
-		$relPath = $relDir . "/" . $FN ;
+		if (! check_perm($relDir, trperm_w))
+			Error("Write access denied","You don't have permission to write in <tt>$relDir</tt>");
+		if ($T == "D") $type = "directory";
+		else $type ="file";
+		if ($FN == "") Error("Can't create $type","You must enter name of $type to create it.");
+		if (!is_writeable($fsDir)) Error("Write denied","User <tt>$gblLogin</tt> has trustee to write in <tt>$relDir</tt> but permissions on <tt>$fsDir</tt> are wrong!", 1) ;
+		$path = "$fsDir/$FN";		// file or dir to create
+		$relPath = "$relDir/$FN";
+
+		if (file_exists($path))
+			Error("Can't create $type","Object <tt>$relPath</tt> allready exists");
+
 		switch ( $T ) {
 		case "D" :  // create a directory
 			if ( ! @mkdir($path,$gblDirPerms) ) 
@@ -1683,53 +1845,54 @@
 // better keep it here altogether
 // chmod perms to $gblFilePerms
 			if ( file_exists($path) && !is_writeable($path) ) 
-				Error("File not writable", $relPath) ;
+				Error("File not writable", "User <tt>$gblLogin</tt> has trustee to write in <tt>$relPath</tt> but permissions on <tt>$path</tt> are wrong!", 1) ;
 			$fh = fopen($path, "w+") ;
 			if ($fh) {
 				fputs($fh,"\n");
 				fclose($fh) ;
 				LogIt($path,"file created",trperm_r | trperm_w);
 			} else {
-				Error("Creation of file $relPath failed -- $path");
+				Error("Creation of file $relPath failed", "User <tt>$gblLogin</tt> has trustee to write in <tt>$relPath</tt> but creation of <tt>$path</tt> failed!", 1) ;
 			}
-			$tstr = "$PHP_SELF?A=E&D=".urlencode($relDir)."&F=".urlencode($FN) ;
+			$tstr = $HTTP_SERVER_VARS["PHP_SELF"]."?A=E&D=".urlencode($relDir)."&F=".urlencode($FN) ;
 			header("Location: " . $tstr) ;
 			exit ;
 		}
 		break ;
 
 	case "DELETE" :  
-		if ( $CONFIRM != "on" ) break ;
+		if ( $CONFIRM != "on" ) break;
 
-		$tstr  = "Attempt to delete non-existing object or " ;
-		$tstr .= "insufficient privileges: " ;
+		if ( isset($FN) && $FN != "") {
+			$path=$fsDir."/".$FN;
+			$what = "file";
+		} elseif (isset($DIR)) {
+			$path=$gblFsRoot."/".$DIR;
+			$what = "directory";
+		} else  {
+			Error("Can't delete object","Can't find filename <tt>\$FN</tt> or dirname in <tt>\$DIR</tt>",1);
+		}
 
-		if ( $FN != "") {  // delete file
-			$path =  $fsDir . "/" . $FN ;
-		
-			$dir=dirname($path);
-			$file=basename($path);
-			if (! file_exists("$dir/.del")) {
-				mkdir("$dir/.del",0700);
-			}
+		if (! check_perm("$relDir/$FN", trperm_w))
+			Error("Access denied","User <tt>$gblLogin</tt> tried to erase $what <tt>$relDir/$FN</tt> without valid trustee.",1);
 
-//			if ( ! @unlink($path) ) { 
-			if ( ! rename($path,"$dir/.del/$file") ) { 
-				LogIt($path,"file delete failed");
-				Error("File delete failed", $tstr . $path) ; 
-			} else {
-				LogIt($path,"file deleted",trperm_w);
-				MoveTo("$dir/.log/$file","$dir/.del/.log/");
-				MoveTo("$dir/.note/$file","$dir/.del/.note/");
-				MoveTo("$dir/.lock/$file","$dir/.del/.lock/");
-			}
-		} else {  // delete directory
-			if ( ! @rrmdir($fsDir) ) {
-				Error("Rmdir failed", $tstr . $fsDir) ; 
-			} else {
-				LogIt($path,"dir deleted",trperm_w);
-				$relDir = dirname($relDir) ;  // move up
-			}
+		$tstr  = "Attempt to delete non-existing object or insufficient privileges: " ;
+
+		$dir=dirname($path);
+		$file=basename($path);
+
+		if (! file_exists("$dir/.del")) {
+			mkdir("$dir/.del",0700);
+		}
+
+		if ( ! @rename($path,"$dir/.del/$file") ) { 
+			LogIt($path,"$what delete failed");
+			Error("Can't delete $what",$tstr."<tt>".$relDir."/".$FN."</tt>") ; 
+		} else {
+			LogIt($path,"$what deleted",trperm_w);
+			MoveTo("$dir/.log/$file","$dir/.del/.log/");
+			MoveTo("$dir/.note/$file","$dir/.del/.note/");
+			MoveTo("$dir/.lock/$file","$dir/.del/.lock/");
 		}
 		break ;
 
@@ -1739,6 +1902,9 @@
 		if (substr($FN,0,4) != ".del") break ;
 		$file=substr($FN,4,strlen($FN)-4);
 
+		if (! check_perm("$relDir/$file", trperm_w))
+			Error("Access denied","User <tt>$gblLogin</tt> tried to undelete <tt>$relDir/$file</tt> without valid trustee.",1);
+
 		LogIt("$fsDir/.del/$file","undeleted",trperm_w);
 		MoveTo("$fsDir/.del/$file","$fsDir/");
 		MoveTo("$fsDir/.del/.log/$file","$fsDir/.log/");
@@ -1750,12 +1916,25 @@
 	case "RENAME" :  
 		if ( $CONFIRM != "on" ) break ;
 
+		if (HTTP_POST_VAR("NEWNAME")) {
+			$dest = remove_parent($relDir.$NEWNAME);
+			if (! check_perm($relDir.$FN, trperm_w) ||
+			    ! check_perm($dest, trperm_w) )
+				Error("Access denied","User <tt>$gblLogin</tt> tried to rename <tt>$relDir$FN</tt> to <tt>$dest</tt> without valid trustee.",1);
+		} else {
+			Error("Rename error","Can't find new name in var <tt>\$NEWNAME</tt>",1);
+		}
 		LogIt("$fsDir/$FN","renamed $FN to $NEWNAME",trperm_r);
 		safe_rename($fsDir,$FN,$NEWNAME);
 		break ;
 
-	case "NOTE" :  
-		WriteNote("$fsDir/$FN","$NOTE");
+	case "NOTE" :
+		if (! HTTP_POST_VAR("NOTE"))
+			Error("Can't add note to object","Can't find var <tt>\$NOTE</tt>",1);
+		if (! check_perm("$relDir/$FN", trperm_w))
+			Error("Access denied","User <tt>$gblLogin</tt> tried to add note to <tt>$relDir/$FN</tt> without valid trustee.",1);
+
+		WriteNote("$fsDir/$FN",$NOTE);
 		break ;
 
 	case "UNLOCK" :  
@@ -1768,12 +1947,12 @@
 	}
 
 	// common to all POSTs : redirect to directory view ($relDir)
-	if ( $POSTACTION != "" ) { 
-		$tstr = $PHP_SELF . "?D=" . urlencode($relDir) ;
-		header("Location: " . $tstr) ;   
+	if (isset($POSTACTION)) { 
+		$tstr = $HTTP_SERVER_VARS["PHP_SELF"]."?D=".urlencode($relDir);
+		header("Location: ".$tstr) ;   
 		exit ;
  	}
-	
+
 	// check for mode.. navigate, code display, upload, or detail?
 	// $A=U : upload to path given in $D
 	// $A=E : display detail of file $D/$F and edit
@@ -1781,14 +1960,16 @@
 	// $A=Co : checkout file $D/$F
 	// $A=Ci : checkin file $D/$F
 	// $A=V : view file (do nothing except log)
-	// $A=I : include file .$F.php from $gblFsRoot
+	// $A=I : include file .$F.php from [$gblIncDir|realm]/include_php
 	// default : display directory $D
 
-	switch ($A) {
+	if (isset($A)) switch ($A) {
 	case "U" :
 		// upload to $relDir
+		if (! check_perm($relDir, trperm_w))
+			Error("Write access denied","You don't have permission to write in <tt>$relDir</tt>");
 		if (!is_writeable($gblFsRoot . $relDir)) 
-			Error("Write access denied",$relDir) ;
+			Error("Write access denied","User <tt>$gblLogin</tt> has permission on <tt>$relDir</tt>, but directory is not writable",1);
 		$text  = "Use this page to upload a single " ;
 		$text .= "file to <B>$realm</B>." ;
 		StartHTML("(Upload Page)", $text) ;
@@ -1836,11 +2017,14 @@
 		EndHTML() ;
 		exit;
 	case "I" :
-		$F=stripSlashes($F);
-		$inc_file="${gblFsRoot}/.${F}.php";
-		if (!isset($F) || $F == "" || !file_exists($inc_file)) Error("Fatal error $inc_file"); // can't find file to include
+		if (! isset($F) || $F == "")
+			Error("Can't find file to include","Your request didn't specify file to include which should be in variable <tt>F</tt> like <tt>$HTTP_SERVER_VARS[REQUEST_URI]<b>&F=include_php_file</b></tt>",1);
+		$inc_file="$fsRealmDir/$realm".$realm_sep.$F.".php";
+		if (! file_exists($inc_file)) {
+			Error("Can't find file to include","Can't find include file <tt>$F.php</tt> in <tt>$fsRealmDir/$realm/</tt>. Meybe you should copy <tt>$gblIncDir/include_php/$F.php</tt> to <tt>$inc_file<tt> ?",1);
+		}
 		if (!is_readable($inc_file))
-			Error("Read access to include file denied",".${F}.php");
+			Error("Read access to include file denied","Can't read PHP include file <tt>$inc_file</tt>. Fix permissions on it.",1);
 		$text  = "Your include file should define \$text variable which holds this text and \$title variable which is page title";
 		$title = "You should define \$title variable with page title";
 		include($inc_file);