mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-15 05:00:49 +08:00
fix getSchemeAndHttpHost()
This commit is contained in:
@@ -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'));
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user