--- docman.php	2002/07/25 21:16:08	1.2
+++ docman.php	2002/07/27 14:45:30	1.3
@@ -87,7 +87,7 @@
 	$realm="$HTTP_HOST";	// FIX
 
 	$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;
@@ -166,9 +166,9 @@
 	$file_lock = CheckLock($fsPath);
 
 	if (!$editable && !$exists) 
-		Error(_("Creation unsupported for type"),$relPath) ;
+		Error("Creation unsupported for type",$relPath) ;
 	if (!exists && !is_writeable($fsDir) )
-		Error(_("Creation denied"),$relDir) ;
+		Error("Creation denied",$relDir) ;
 
 	$text  = _("Use this page to view, modify or ") ;
 	if (is_dir($fsPath)) {
@@ -930,20 +930,43 @@
 
 //////////////////////////////////////////////////////////////////
 
-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) {
+	global $gblSeparateAdminMessages,
+		$gblMailAdminMessages,$realm,
+		$HTTP_SERVER_VARS;
+	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);
 
@@ -1267,8 +1290,6 @@
 	$groups_arr = array();
 	$perm_arr = array();
 
-	$error=0;
-
 	$tr_arr = array();
 
 	while (! feof($fp_conf)) {
@@ -1336,7 +1357,7 @@
 }
 
 if ($error) {
-	Error("Trustee error",$error);
+	Error("Trustee error",$error,1);
 } else {
 	include("$trustee_php");
 }
@@ -1484,6 +1505,8 @@
 		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";
 	// compiled version of trustee file
@@ -1803,5 +1826,5 @@
 	Navigate($gblFsRoot,$relDir) ;	
 	exit ;
 
-	Error("Whooah!","By cartesian logic, this never happens") ;
+	Error("Whooah!","By cartesian logic, this never happens",1) ;
 ?>