From 000875a032e666b230c934f19f193e798161b353 Mon Sep 17 00:00:00 2001 From: Matus Kalafut Date: Mon, 24 Jul 2023 13:43:45 +0000 Subject: [PATCH] Change `asset()` function in `showtime.php` to return absolute URL remp/remp#1282 (cherry picked from commit c695752d8010df34f9969f002e28353cfb063d4b) --- Campaign/public/showtime.php | 17 ++++++++++++++++- changelogs/CHANGELOG-v3.1.md | 4 +++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Campaign/public/showtime.php b/Campaign/public/showtime.php index 6ef4d92d9..aaf143d95 100644 --- a/Campaign/public/showtime.php +++ b/Campaign/public/showtime.php @@ -23,7 +23,22 @@ * @return string */ function asset($path, $secure = null) { - return '//' . $_SERVER['HTTP_HOST'] . '/' . trim($path, '/'); + return ((isSecure() ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . '/' . trim($path, '/')); +} + +function isSecure(): bool +{ + if ((isset($_SERVER['HTTPS']) && (($_SERVER['HTTPS'] === 'on') || ($_SERVER['HTTPS'] === '1'))) + || (isset($_SERVER['HTTPS']) && $_SERVER['SERVER_PORT'] === 443)) { + return true; + } + + if ((!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') + || (!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] === 'on')) { + return true; + } + + return false; } /** diff --git a/changelogs/CHANGELOG-v3.1.md b/changelogs/CHANGELOG-v3.1.md index 3a0cb54f5..ef0a1dc32 100644 --- a/changelogs/CHANGELOG-v3.1.md +++ b/changelogs/CHANGELOG-v3.1.md @@ -1,5 +1,7 @@ ## [3.1] - 2023-07-24 +- [3.1.1] [Campaign]: Changed `asset()` function in `showtime.php` to return absolute URL. remp/remp#1282 + ### [Beam] - Added make commands `update-dev` and `update-prod` to update development and production environments respectively after new code is pulled. remp/remp#1281 @@ -25,7 +27,7 @@ --- -[3.1]: https://github.com/remp2020/remp/compare/3.0.0...3.1.0 +[3.1.1]: https://github.com/remp2020/remp/compare/3.1.0...3.1.1 [Beam]: https://github.com/remp2020/remp/tree/master/Beam [Campaign]: https://github.com/remp2020/remp/tree/master/Campaign