--- docman.php 2002/07/28 12:14:18 1.14 +++ docman.php 2002/07/28 13:08:21 1.15 @@ -1548,6 +1548,8 @@ } // if no password, or empty password logout + $relogin = $HTTP_GET_VARS[relogin]; + $force_login = $HTTP_GET_VARS[force_login]; if ( isset($gblLogin) && ( !isset($relogin) || ( @@ -1875,15 +1877,12 @@ case "I" : if (! isset($F) || $F == "") Error("Can't find file to include","Your request didn't specify file to include which should be in variable F like $HTTP_SERVER_VARS[REQUEST_URI]&F=include_php_file",1); - if (file_exists("$gblIncDir/include_php/$F.php")) { - $inc_file="$gblIncDir/include_php/${F}.php"; - } elseif (file_exists("$fsRealmDir/$realm/$F.php")) { - $inc_file="$fsRealmDir/$realm/${F}.php"; - } else { - Error("Can't find file to include","Can't find include file $F.php in $gblIncDir/include_php/ nor $fsRealmDir/$realm/",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 $F.php in $fsRealmDir/$realm/. Meybe you should copy $gblIncDir/include_php/$F.php to $inc_file ?",1); } if (!is_readable($inc_file)) - Error("Read access to include file denied","Can't read PHP include file $inc_file. Fix permissions on it."); + Error("Read access to include file denied","Can't read PHP include file $inc_file. 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);