--- docman.php 2002/07/28 19:52:11 1.23 +++ docman.php 2002/07/29 09:36:22 1.24 @@ -1424,11 +1424,14 @@ }// end of helper function function check_trustee($user,$path) { - global $trustees; + global $trustees,$HAVE_TRUSTEE; $perm['allow'] = 0; $perm['deny'] = 0; - if (! isset($trustees)) Error("Trustees not found","Can't find in-memory trustee structure \$trustees. Probably bug in code. Contact dpavlin@rot13.org",1); + // do we use trustees? + if (! $HAVE_TRUSTEE) return $perm; + + if (! isset($trustees)) Error("Trustees not found","Can't find in-memory trustee structure \$trustees. Probably bug in code. Contact dpavlin@rot13.org",1); global $debug; $debug .= "
check_trustee $path ... "; @@ -1584,7 +1587,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 $docman_conf. See docman2/doc/upgrade.html#docman_conf for more informations"; error_log("docman: $error"); Error("docman not installed completly",$error);