From 3297a7c51aef81eee6cd6c33266c04f46cbd04a7 Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 7 Nov 2023 22:01:43 +0100 Subject: [PATCH] Better https detection --- common.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common.php b/common.php index 13cdabb7..c51381fe 100644 --- a/common.php +++ b/common.php @@ -136,7 +136,7 @@ if(!IS_CLI) { } } - define('SERVER_URL', 'http' . (isset($_SERVER['HTTPS'][0]) && strtolower($_SERVER['HTTPS']) === 'on' ? 's' : '') . '://' . $baseHost); + define('SERVER_URL', 'http' . (isHttps() ? 's' : '') . '://' . $baseHost); define('BASE_URL', SERVER_URL . BASE_DIR . '/'); define('ADMIN_URL', SERVER_URL . BASE_DIR . '/' . ADMIN_PANEL_FOLDER . '/'); @@ -165,3 +165,11 @@ if (!is_file($autoloadFile)) { } require $autoloadFile; + +function isHttps(): bool +{ + return + (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https') + || (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') + || $_SERVER['SERVER_PORT'] == 443; +}