Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'reverse-proxy' into master

Browse source
This commit is contained in:
Kyle Robbertze 2020-09-28 15:09:10 +02:00
commit 2003e685b0
7 changed files with 63 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/common/HTTPHelper.php
View file

@ -31,6 +31,7 @@ class Application_Common_HTTPHelper
$baseUrl = $CC_CONFIG['baseUrl'];
$baseDir = $CC_CONFIG['baseDir'];
$basePort = $CC_CONFIG['basePort'];
$forceSSL = $CC_CONFIG['forceSSL'];
if (empty($baseDir)) {
$baseDir = "/";
}
@ -42,7 +43,7 @@ class Application_Common_HTTPHelper
}
$scheme = "http";
if ($secured && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
if ($forceSSL || ($secured && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')) {
$scheme = "https";
$basePort = "443"; //Airtime Pro compatibility hack
}