tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/develop' into develop

This commit is contained in:
Ramon Novoa 2018-10-29 13:20:48 +01:00
parent 4d689d3ce8 3e584747b3
commit 6353af0482
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions.php
View File

@ -69,6 +69,10 @@ require_once('functions_io.php');
//} //}
function https_is_running() { function https_is_running() {
if(isset ($_SERVER['HTTP_X_FORWARDED_PROTO'])
&& $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
return true;
}
if (isset ($_SERVER['HTTPS']) if (isset ($_SERVER['HTTPS'])
&& ($_SERVER['HTTPS'] === true && ($_SERVER['HTTPS'] === true
|| $_SERVER['HTTPS'] == 'on')) { || $_SERVER['HTTPS'] == 'on')) {

4
pandora_console/include/functions_ui.php
View File

@ -2395,6 +2395,10 @@ function ui_get_full_url ($url = '', $no_proxy = false, $add_name_php_file = fal
$port = null; // null means 'use the starndard port' $port = null; // null means 'use the starndard port'
$proxy = false; //By default Pandora FMS doesn't run across proxy. $proxy = false; //By default Pandora FMS doesn't run across proxy.
if(isset ($_SERVER['HTTP_X_FORWARDED_PROTO'])
&& $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
$_SERVER['HTTPS'] = 'on';
}
if (isset ($_SERVER['HTTPS']) if (isset ($_SERVER['HTTPS'])
&& ($_SERVER['HTTPS'] === true && ($_SERVER['HTTPS'] === true
|| $_SERVER['HTTPS'] == 'on')) { || $_SERVER['HTTPS'] == 'on')) {