fix getSchemeAndHttpHost()

This commit is contained in:
xiaomlove
2021-03-05 19:43:40 +08:00
parent bdefe4d30b
commit cb4e5e5eb5
5 changed files with 11 additions and 9 deletions

View File

@@ -11,8 +11,7 @@ if (!file_exists($rootpath . '.env')) {
$installScriptRelativePath = 'install/install.php';
$installScriptFile = $rootpath . "public/$installScriptRelativePath";
if (file_exists($installScriptFile)) {
header('Location: ' . getBaseUrl() . '/' . $installScriptRelativePath);
exit(0);
redirect($installScriptRelativePath);
}
}
ini_set('date.timezone', config('nexus.timezone'));

View File

@@ -4534,7 +4534,10 @@ function getFullDirectory($dir)
if (!is_dir($dir)) {
$dir = ROOT_PATH . $dir;
}
return realpath($dir);
if (is_dir($dir)) {
return realpath($dir);
}
return $dir;
}
function checkGuestVisit()

View File

@@ -403,9 +403,10 @@ function getSchemeAndHttpHost()
$protocol = $isHttps ? 'https' : 'http';
$port = $_SERVER['SERVER_PORT'];
$result = "$protocol://" . $_SERVER['HTTP_HOST'];
if ((!$isHttps && $port != 80) || ($isHttps && $port != 443)) {
$result .= ":$port";
}
//HTTP_HOST include port
// if ((!$isHttps && $port != 80) || ($isHttps && $port != 443)) {
// $result .= ":$port";
// }
return $result;
}