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

correctly determine protocol from port and configuration in PHP

Browse source 
Fixes: #1283
This commit is contained in:
Kyle Robbertze 2021-08-06 11:13:00 +02:00
parent 579dfe5b9e
commit 5466cd8688
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ class Application_Common_HTTPHelper
$baseDir = $CC_CONFIG['baseDir'];
$basePort = $CC_CONFIG['basePort'];
$forceSSL = $CC_CONFIG['forceSSL'];
$configProtocol = $CC_CONFIG['protocol'];
if (empty($baseDir)) {
$baseDir = "/";
}
@ -42,15 +43,22 @@ class Application_Common_HTTPHelper
$baseDir = $baseDir . "/";
}
# Set in reverse order of preference. ForceSSL configuration takes absolute preference, then
# the protocol set in config. If neither are set, the port is used to determine the scheme
$scheme = "http";
if ($forceSSL || ($secured && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')) {
if ($secured && $basePort == "443") {
$scheme = "https";
$basePort = "443"; //Airtime Pro compatibility hack
}
if (!empty($configProtocol)) {
$scheme = $configProtocol;
}
if ($forceSSL) {
$scheme = "https";
}
$portStr = "";
if (!(($scheme == "http" && $basePort == "80")
|| ($scheme == "https" && $basePort == "443"))) {
if (($scheme == "http" && $basePort !== "80")
|| ($scheme == "https" && $basePort !== "443")) {
$portStr = ":${basePort}";
}
$stationUrl = "$scheme://${baseUrl}${portStr}${baseDir}";