--- docman.php	2002/07/25 21:16:08	1.2
+++ docman.php	2002/07/28 16:24:54	1.18
@@ -20,13 +20,13 @@
 //////////////////////////////////////////////////////////////////
 // CONFIGURATION OPTIONS
 
-// 	error_reporting(4) ;		// how verbose ?
+ 	error_reporting(E_ALL) ;		// how verbose ?
 
 	// from where to include auth_*.php modules?
 	$gblIncDir = "/data/docman2";
 
-	// force download (so it won't open in associated application)
-	$gblForceDownload = 1;
+	// force download on view (so it won't open in associated application)
+	$gblForceDownload = 0;
 
 	// date format
 	$gblDateFmt="Y-m-d";
@@ -84,14 +84,14 @@
 	LoadLanguage($HTTP_SERVER_VARS["HTTP_ACCEPT_LANGUAGE"]);
 
 	// for security and configuration
-	$realm="$HTTP_HOST";	// FIX
+	$realm=$HTTP_SERVER_VARS["HTTP_HOST"];
 
 	$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>");
+	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 = $PHP_AUTH_USER;
-	$gblPasswd = $PHP_AUTH_PW;
+	$gblLogin = $HTTP_SERVER_VARS[PHP_AUTH_USER];
+	$gblPasswd = $HTTP_SERVER_VARS[PHP_AUTH_PW];
 
 //////////////////////////////////////////////////////////////////
 
@@ -109,16 +109,16 @@
 
 function StartHTML($title,$text="") {
 
-	global $html,$fsDocumentRoot;
+	global $html,$fsDocumentRoot,$HTTP_SERVER_VARS;
 
 	$title = $gblTitle." ".$title ;
-	$host  = $GLOBALS["HTTP_HOST"] ;
-	$self  = $GLOBALS["PHP_SELF"] ;
+	$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,22 +138,26 @@
 	} 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");
-	//phpinfo();
+
+	global $debug;
+	if ($debug) print $debug;
 } // end function EndHTML
 
 //////////////////////////////////////////////////////////////////
 
 function DetailPage($fsRoot,$relDir,$fn) {
 	
-	global $gblEditable, $gblImages, $webRoot, $html ;
-	$self = $GLOBALS["PHP_SELF"] ;
+	global $gblEditable, $gblImages, $webRoot, $html, $HTTP_SERVER_VARS ;
+	$self = $HTTP_SERVER_VARS["PHP_SELF"] ;
 
 	$relPath  = $relDir . "/" . $fn ;
 	$fsPath   = $fsRoot . $relPath ;
@@ -161,14 +165,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)) {
@@ -201,7 +207,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>
@@ -572,46 +578,51 @@
 function Navigate($fsRoot,$relDir) {
 
 	global $gblEditable, $gblIcon, $gblModDays, $webRoot, $gblHide,
-		$HTTP_GET_VARS, $html;
+		$gblIgnoreUnknownFileType, $gblRepositoryDir,
+		$fsRealmDir, $realm, $realm_sep,
+		$HTTP_GET_VARS, $html, $realm_config;
+	
+	$self     = $HTTP_SERVER_VARS["PHP_SELF"] ;
 
-	$self     = $GLOBALS["PHP_SELF"] ;
+	$relDir = chopsl($relDir)."/";
+	$fsDir = $fsRoot.$relDir;	// current directory
 
-	if ($relDir == "") $relDir = "/";
+	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 | trperm_r)))
+		Error("Access denied","User <tt>$gblLogin</tt> tried to access <tt>$relDir</tt> without valid trustee.",1);
+	$debug .= "< afeter";
 
 	$hide_items=",$gblHide,";
 
-#display_all_trustee();
-print "-- $fsDir --";
-
 	// read directory contents
 	if ( !($dir = @opendir($fsDir)) ) 
-		Error("Read Access denied",$relDir) ;
+		Error("Read Access denied",$relDir,1) ;
 	while ($item = readdir($dir)) {
-print "$item, ";
 		if ( substr($item,0,1) == "." || strstr($hide_items,",$item,") ) continue ;
-		if ((is_dir($fsDir.$item) || is_link ($fsDir.$item)) && check_perm($relDir.$item,trperm_b)) {
-			$dirList[$item] = $item ;
-			$dirNote[$item] = ReadNote($fsDir.$item);
-		} else if ( is_file($fsDir.$item) && check_perm($relDir.$item,trperm_r) ) {
-			$fileList[$item] = $item ;		
-			$fileDate[$item] = filemtime($fsDir.$item) ;
-			$fileSize[$item] = filesize($fsDir.$item) ;
-			$fileNote[$item] = ReadNote($fsDir.$item);
+		if (is_dir($fsDir.$item) || is_link ($fsDir.$item)) {
+			if (check_perm($relDir.$item,trperm_b)) {
+				$dirList[$item] = $item ;
+				$dirNote[$item] = ReadNote($fsDir.$item);
+			}
+		} else if (is_file($fsDir.$item)) {
+			if (check_perm($relDir.$item,trperm_r)) {
+				$fileList[$item] = $item ;		
+				$fileDate[$item] = filemtime($fsDir.$item) ;
+				$fileSize[$item] = filesize($fsDir.$item) ;
+				$fileNote[$item] = ReadNote($fsDir.$item);
+			}
 		} else {
-		  // unknown file type
-		  // $text = "Could not determine file type of " ;
-		  // Error("File Error", $text.$relDir."/".$item) ;
-		  // exit ;
+			if (! $gblIgnoreUnknownFileType) Error("File Type Error", "Item <tt>".$fsDir.$item."</tt> is not file, directory or link. If you want to ignore errors like this, set <tt>\$gblIgnoreUnknownFileType = 1</tt> in <tt>$realm_config</tt>.",1);
 		}
 	}
 	closedir($dir) ; 
 
 	// scan deleted files
-	if ( $GLOBALS[show_deleted] == 1 && ($dir = @opendir("$fsDir/.del")) ) {
+	if ( $HTTP_GET_VARS["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" ;		
@@ -626,7 +637,7 @@
 
 	// start navigation page
 	$text  = "Use this page to add, delete";
-	if (! isset($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." ;
@@ -636,7 +647,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 = "/" ;
@@ -716,7 +727,7 @@
 			$dir = $dirList[$key];
 
 			$info_url=self_args(array("A"=>"A=E", "F"=>"F=".urlencode($dir), "D"=>$D));
-			$dir_url=$self."?D=".urlencode($relDir."/".$dir);
+			$dir_url=$self."?D=".urlencode(chopsl($relDir)."/".$dir);
 			include("$html/Navigate-dirEntry.html");
 
 		}  // iterate over dirs
@@ -788,8 +799,7 @@
 
 		$file_lock=CheckLock($path);
 
-		$file_url_html="<A HREF=\"$self?A=V&F=".urlencode($file);
-		$file_url_html.="&D=".urlencode($relDir);
+		$file_url_html="<A HREF=\"$self?A=V&D=".urlencode($relDir)."&F=".urlencode($file);
 		$file_url_html.="\" TITLE=\"View file\">" ;
 
 		if (substr($file,0,5) != ".del/") {
@@ -804,8 +814,7 @@
 
 		if ($file_lock) {
 			if ($file_lock == $GLOBALS[gblUserName]) {
-				$b.="<A HREF=\"$self?A=Ci&F=".urlencode($file);
-				$b.="&D=".urlencode($relDir);
+				$b.="<A HREF=\"$self?A=Ci&D=".urlencode($relDir)."&F=".urlencode($file);
 				$b.="\" TITLE=\"Checkin (update) file on server\">" ;
 				$file_url_html=$b;
 				$b.=$gblIcon("checkin")."</A>" ;
@@ -819,14 +828,12 @@
 				$file_url_html = "$file $a";
 			}
 		} else {
-			$b.="<A HREF=\"$self?A=Co&F=".urlencode($file);
-			$b.="&D=".urlencode($relDir);
+			$b.="<A HREF=\"$self?A=Co&D=".urlencode($relDir)."&F=".urlencode($file);
 			$b.="\" TITLE=\"Checkout file for edit\">" ;
-			$b.=$gblIcon("checkout")."</A>" ;
+			$b.=$gblIcon("checkout")."</A>";
 
 			if ( $ext=="" || strstr(join(" ",$gblEditable),$ext) ) {  
-				$b.="<A HREF=\"$self?A=C&F=".urlencode($file);
-				$b.="&D=".urlencode($relDir);
+				$b.="<A HREF=\"$self?A=C&D=".urlencode($relDir)."&F=".urlencode($file);
 				$b.="\" TITLE=\"List contents\">" ;
 				$b.=$gblIcon("view")."</A>" ;
 			} else {
@@ -866,12 +873,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 ?>">
@@ -896,54 +909,53 @@
 
 function UploadPage($fsRoot, $relDir, $filename="") {
 
-	$self = $GLOBALS["PHP_SELF"] ;
-	if ($relDir == "") $relDir = "/" ; 
-?>
+	global $html, $HTTP_SERVER_VARS;
 
-<P><TABLE BORDER=0 CELLPADDING=5><TR><TD WIDTH=5></TD><TD CLASS=BAR>
-<FORM ENCTYPE="multipart/form-data" METHOD="POST" 
- ACTION="<?= $self ?>">
-DESTINATION DIRECTORY:<B><?= " " . $relDir ?></B>
-<? if (isset($filename) && $filename!="") { ?>
-<br>DESTINATION FILE:<B><?= " " . $filename ?></B>
-<INPUT TYPE="HIDDEN" NAME="FILENAME" VALUE="<?= $filename ?>">
-<? } ?>
-<P>PATHNAME OF LOCAL FILE<BR>
-<INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ?>">
-<INPUT TYPE="HIDDEN" NAME="POSTACTION" VALUE="UPLOAD">
-<INPUT SIZE=30 TYPE="FILE" NAME="FN"></P>
-<P><INPUT TYPE="SUBMIT" VALUE="UPLOAD"></P>
-<P>If the <B>[BROWSE...]</B> button is not displayed,<BR>
-you must upgrade to an RFC1867-compliant browser.</P>
-<P>Your browser:<BR><?= $GLOBALS["HTTP_USER_AGENT"] ?></P>
-</FORM>
-</TD></TR>
-<TR><TD></TD><TD>
-<FORM METHOD="POST" ACTION="<?= $self ?>">
-<INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ?>"><BR>
-<INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="CANCEL">
-</FORM>
-</TD></TR></TABLE></P>
+	$self = $HTTP_SERVER_VARS["PHP_SELF"] ;
+	include("$html/UploadPage.html");
 
-<?php	
 } // end function UploadPage
 
 //////////////////////////////////////////////////////////////////
 
-function Error($title,$text="") {
-	StartHTML("(".$title.")",$text) ;
-	echo "<P ALIGN=center>Hit your Browser's Back Button.</P>" ;
-	EndHTML() ;
+// Error with sysadmin flag are reported to error_log or hidden from
+// users
+
+function Error($title,$text="",$sysadmin=0,$no_404=0) {
+	global $gblSeparateAdminMessages,
+		$gblMailAdminMessages,$realm,
+		$HTTP_SERVER_VARS;
+	if (! headers_sent() && ! $no_404) header("HTTP/1.0 404 Not Found");
+	if ($sysadmin) {
+		if ($gblSeparateAdminMessages) {
+			$user="Your administrator ";
+			if ($gblMailAdminMessages) {
+				mail($HTTP_SERVER_VARS["SERVER_ADMIN"], "docman $realm error message: $title", strip_tags($text));
+				$user.="<tt>".$HTTP_SERVER_VARS["SERVER_ADMIN"]."</tt> ";
+			}
+			$user.="has been notified about error" ;
+			StartHTML("($title)",$user);
+			echo "<P ALIGN=center>Hit your Browser's Back Button.</P>" ;
+			EndHTML();
+			error_log("docman $realm: ".strip_tags($text));
+		} else {
+			StartHTML("ADMIN: ".$title,$text) ;
+			echo "<P ALIGN=center>Hit your Browser's Back Button.</P>" ;
+			EndHTML();
+		}
+	} else { 
+		StartHTML("(".$title.")",$text) ;
+		echo "<P ALIGN=center>Hit your Browser's Back Button.</P>" ;
+		EndHTML() ;
+	}
 	exit ;
 } // end function Error
 
-//////////////////////////////////////////////////////////////////
-
 function LogIt($target,$msg, $changelog=0) {
 
 	$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>");
+		if (! @mkdir($dir."/.log",0700)) Error("docman installation problem","can't create log directory <tt>$dir/.log</tt>",1);
 	}
 	$file=basename($target);
 
@@ -1082,13 +1094,15 @@
 	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);
 	        }
 	}
 
@@ -1098,7 +1112,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");
@@ -1134,7 +1148,8 @@
 
 function DisplayChangeLog($day) {
 
-	global $gblFsRoot;
+	global $gblFsRoot,$HTTP_SERVER_VARS;
+
 	if (!file_exists("$gblFsRoot/.changelog")) return;
 	$log=fopen("$gblFsRoot/.changelog","r");
 	$logarr = array();
@@ -1156,28 +1171,50 @@
 		$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 "<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=$GLOBALS[PHP_SELF]>front page</a>.</p>";
+	print "<p>".GifIcon(up)." Back to <a href=$HTTP_SERVER_VARS[PHP_SELF]>front page</a>.</p>";
 }
 
 //////////////////////////////////////////////////////////////////
 
-function Download($path) {
-	global $HTTP_USER_AGENT;
-	$file=basename($path);
+function Download($path,$force=0) {
+	global $HTTP_SERVER_VARS,$mime_type;
+
+	// default transfer-encoding
+	$encoding = "binary";
+
+	// known transfer encodings
+	$encoding_ext = array(
+		"gz" => "x-gzip",
+		"Z" => "x-compress",
+	);
+
+	$file = basename($path);
 	$size = filesize($path);
-	//header("Content-Type: application/octet-stream");
-	header("Content-Type: application/force-download");
-	header("Content-Length: $size");
+
+	$ext_arr = explode(".",$file);
+	$ext = array_pop($ext_arr);
+	if ($encoding_ext[$ext]) {
+		$encoding = $encoding_ext[$ext];
+		$ext = array_pop($ext_arr);
+	}
+
+	if ($force || !isset($mime_type[$ext])) {
+		header("Content-Type: application/force-download");
+	} else {
+		header("Content-Type: $mime_type[$ext]");
+	}
+
 	// IE5.5 just downloads index.php if we don't do this
-	if(preg_match("/MSIE 5.5/", $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");
 	}
-	header("Content-Transfer-Encoding: binary");
+
+	header("Content-Transfer-Encoding: $encoding");
 	$fh = fopen($path, "r");
 	fpassthru($fh);
 }
@@ -1186,8 +1223,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;
 }
 
@@ -1267,8 +1304,6 @@
 	$groups_arr = array();
 	$perm_arr = array();
 
-	$error=0;
-
 	$tr_arr = array();
 
 	while (! feof($fp_conf)) {
@@ -1336,7 +1371,7 @@
 }
 
 if ($error) {
-	Error("Trustee error",$error);
+	Error("Trustee error",$error,1);
 } else {
 	include("$trustee_php");
 }
@@ -1346,12 +1381,14 @@
 }//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
+
+	// check user FIX
 	if ($t & trmask_not && ($u==$user)) continue;
 	if (!($t & trmask_not) && ($u!=$user)) continue;
 
@@ -1373,12 +1410,21 @@
 	global $trustees;
 	$perm[allow] = 0;
 	$perm[deny] = 0;
+
+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 (substr($tmppath,strlen($tmppath)-1,1) != "/") $tmppath.="/";
+		$tr = $trustees[$tmppath];
+
+		# clear one level flag
+		$perm[allow] &= ~trperm_one_level;
+		$perm[deny] &= ~trperm_one_level;
 
 		if (isset($tr)) {
 			// first apply trustee for all
@@ -1387,26 +1433,25 @@
 				unset($tr['*']);
 			}
 			// then apply group policies
-			foreach ($tr as $u=>$t) {
-				if ($t & trmask_group && in_group($user,$u)) {
+			foreach ($tr as $g=>$t) {
+				if ($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,$user, $perm);
+					unset($tr[$g]);
 				}
 			}
-			// then apply use policy
+			// then apply user policy
 			if (isset($tr[$user])) {
 				$perm = unroll_perm($user,$tr[$user],$user, $perm);
 				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;
 }
 
@@ -1414,18 +1459,58 @@
 
 function check_perm($path,$trperm) {
 	global $gblLogin,$HAVE_TRUSTEE;
-print "<br>check_perm: <tt>$path</tt> test perm ".display_trustee($perm)."<br>\n";
+
+	global $debug;
+$debug.="<br>check_perm: <tt>$path</tt> test perm ".display_trustee($perm)."<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";
+$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) $return=1;
+		elseif (($perm[allow] & $trperm) == $trperm) $return=1;
 	}
-print " return: $return<br>\n";
+$debug.=" return: $return<br>\n";
 	return($return);
 }
 
+//////////////////////////////////////////////////////////////////
+
+function readMime() {
+	global $mime_type;
+
+	if (! isset($gblMimeTypes)) {
+		$gblMimeTypes = "/etc/mime.types";
+	}
+
+	$mime = @fopen($gblMimeTypes,"r");
+
+	if (! $mime) Error("Can't read MIME types","<tt>$gblMimeTypes</tt> file not found. You can setup other <tt>mime.types</tt> file using <tt>\$gblMimeTypes</tt> in <tt>$realm_config</tt>");
+
+	while($line = fgets($mime,80)) {
+		if (substr($line,0,1) == "#") continue;	// skip comment
+		$arr = preg_split("/[\s\t]+/",$line);
+		$type = array_shift($arr);
+		while ($ext = array_shift($arr)) {
+			$mime_type[$ext] = $type;
+		}
+	}
+
+	fclose($mime);
+}
+
+//////////////////////////////////////////////////////////////////
+
+// 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);
+	if (strstr($file,"/")) Error("Security violation","No slashes <tt>/</tt> allowed in file name <tt>$file</tt>",1);
+}
 
 //////////////////////////////////////////////////////////////////
 // MAIN PROGRAM
@@ -1433,6 +1518,7 @@
 	$gblFilePerms = 0640 ;         // default for new files
 	$gblDirPerms  = 0750 ;		// default for new dirs
 
+	$STYLE = $HTTP_GET_VARS[STYLE];
 	if (isset($STYLE) && $STYLE == "get") {
 		include("$html/docman.css");
 		exit;
@@ -1451,7 +1537,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)) {
@@ -1469,6 +1564,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
+	$relogin = $HTTP_GET_VARS[relogin];
+	$force_login = $HTTP_GET_VARS[force_login];
+
 	// if no password, or empty password logout
 	if (
 		isset($gblLogin) && (
@@ -1484,18 +1583,21 @@
 		exit ;
 	}
 
+	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",$path);
 		// browsing must be explicitly allowed for root directory
 		// of repository for anonymous user to work!
 		if ($perm[allow] & trperm_b) {
+			$gblLogin = $gblPasswd = "anonymous";
 			$secHash = md5($gblLogin.$gblPasswd);
 			$gblUserName = "Anonymous user";
 		}
@@ -1506,60 +1608,73 @@
 		isset($relogin) && $secHash == $relogin) {
 		header("WWW-authenticate: basic realm=\"$realm\"") ;
 		header("HTTP/1.0 401 Unauthorized") ;
-		Error("401 Unauthorized","No trespassing !");
-		exit ;
+		Error("401 Unauthorized","No trespassing !",0,1);
 	}
 
-	// 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");
-
-	// 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.
+
+	// read mime.types
+	readMime();
+
+	if ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") {
+		// 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"]);
+
+		check_filename($FN);
+		check_dirname($DIR);
+		check_dirname($RELPATH);
+
+		$relDir = $DIR;
+	} else {
+		// get
+		$A=stripSlashes($HTTP_GET_VARS["A"]);
+		$D=stripSlashes(urldecode($HTTP_GET_VARS["D"]));
+		$F=stripSlashes($HTTP_GET_VARS["F"]);
+
+		check_filename($F);
+		check_dirname($D);
+
+		$relDir = $D;
+	}
 
 	$relScriptDir = dirname($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($GLOBALS["HTTPS"]) && $GLOBALS["HTTPS"] == "on") {
+	if (isset($HTTP_SERVER_VARS["HTTPS"]) && $HTTP_SERVER_VARS["HTTPS"] == "on") {
 		$webRoot  = "https://";
 	} else {
 		$webRoot  = "http://";
 	}
-	$webRoot .= $GLOBALS["HTTP_HOST"] . $relScriptDir;
-
-	$FN=stripSlashes($FN);
+	$webRoot .= $HTTP_SERVER_VARS["HTTP_HOST"] . $relScriptDir;
 
-	switch ($POSTACTION) {
+	switch ($HTTP_POST_VARS["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 ;
+
+		$source = $FN_name ;
 		if (! file_exists($source)) {
 			Error("You must select file with browse to upload it!");
 		}
+
+		$FILENAME = $HTTP_POST_VARS["FILENAME"];
+		check_filename($FILENAME);
+
 		if (! isset($FILENAME)) { 	// from update file
-			$target = "$fsDir/$FN_name" ;
+			$target = "$fsDir/".basename($FN);
 		} else {
 			$target = "$fsDir/$FILENAME";
 		}
@@ -1657,9 +1772,8 @@
 
 //			if ( ! @unlink($path) ) { 
 			if ( ! rename($path,"$dir/.del/$file") ) { 
-				Error("File delete failed", $tstr . $path) ; 
 				LogIt($path,"file delete failed");
-				exit ; 
+				Error("File delete failed", $tstr . $path) ; 
 			} else {
 				LogIt($path,"file deleted",trperm_w);
 				MoveTo("$dir/.log/$file","$dir/.del/.log/");
@@ -1693,11 +1807,13 @@
 	case "RENAME" :  
 		if ( $CONFIRM != "on" ) break ;
 
+		$NEWNAME=stripSlashes($HTTP_POST_VARS["NEWNAME"]);
 		LogIt("$fsDir/$FN","renamed $FN to $NEWNAME",trperm_r);
 		safe_rename($fsDir,$FN,$NEWNAME);
 		break ;
 
 	case "NOTE" :  
+		$NOTE=stripSlashes($HTTP_POST_VARS["NOTE"]);
 		WriteNote("$fsDir/$FN","$NOTE");
 		break ;
 
@@ -1724,22 +1840,23 @@
 	// $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) {
 	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>$HTTP_HOST</B>." ;
+		$text .= "file to <B>$realm</B>." ;
 		StartHTML("(Upload Page)", $text) ;
 		UploadPage($gblFsRoot, $relDir) ;
 		EndHTML() ;
 		exit ;
 	case "E" :
-		$F=stripSlashes($F);
 		// detail of $relDir/$F
 		if (is_file("$gblFsRoot/$relDir/$F") || is_dir("$gblFsRoot/$relDir/$F")) DetailPage($gblFsRoot, $relDir, $F) ;
 		exit ;
@@ -1751,7 +1868,7 @@
 	case "Co" :
 		// checkout
 		Lock("$gblFsRoot/$relDir/$F");
-		Download("$gblFsRoot/$relDir/$F");
+		Download("$gblFsRoot/$relDir/$F",1);
 		exit;
 	case "Ci" :
 		$F=stripSlashes($F);
@@ -1759,7 +1876,7 @@
 		if (!is_writeable($gblFsRoot . $relDir)) 
 			Error("Write access denied",$relDir) ;
 		$text  = "Use this page to update a single " ;
-		$text .= "file to <B>$HTTP_HOST</B>." ;
+		$text .= "file to <B>$realm</B>." ;
 		StartHTML("(Update file Page)", $text) ;
 		UploadPage($gblFsRoot, $relDir, $F) ;
 		EndHTML() ;
@@ -1767,12 +1884,7 @@
 	case "V" :
 		// view
 		LogIt("$gblFsRoot/$relDir/$F","viewed");
-		if ($gblForceDownload) {
-			Download("$gblFsRoot/$relDir/$F");
-		} else {
-			header("Content-Disposition: attachment; filename=$F" );
-			Header("Location: $webRoot".urlpath("$relDir/$F"));
-		}
+		Download("$gblFsRoot/$relDir/$F",$gblForceDownload);
 		exit;
 	case "Ch" :
 		StartHTML("(File changes)","All changes chronologicaly...");
@@ -1785,16 +1897,19 @@
 		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);
 		StartHTML($title, $text) ;
-		print "<p>".GifIcon(up)." Back to <a href=$GLOBALS[PHP_SELF]>front page</a>.</p>";
+		print "<p>".GifIcon(up)." Back to <a href=$HTTP_SERVER_VARS[PHP_SELF]>front page</a>.</p>";
 		EndHTML() ;
 		exit ;
 	}
@@ -1803,5 +1918,5 @@
 	Navigate($gblFsRoot,$relDir) ;	
 	exit ;
 
-	Error("Whooah!","By cartesian logic, this never happens") ;
+	Error("Whooah!","By cartesian logic, this never happens",1) ;
 ?>