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

minor fix adding slash if not found

This commit is contained in:
fbsanchez 2019-07-31 10:59:51 +02:00
parent 6713f51414
commit 1e73105fc9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_ui.php
View File

@ -3768,14 +3768,22 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
if (ui_forced_public_url()) { if (ui_forced_public_url()) {
$proxy = true; $proxy = true;
$fullurl = $config['public_url']; $fullurl = $config['public_url'];
if (substr($fullurl, -1) != '/') {
$fullurl .= '/';
}
if ($url == 'index.php' && is_metaconsole()) { if ($url == 'index.php' && is_metaconsole()) {
$fullurl .= '/'.ENTERPRISE_DIR.'/meta'; $fullurl .= ENTERPRISE_DIR.'/meta';
} }
} else if (!empty($config['public_url']) } else if (!empty($config['public_url'])
&& (!empty($_SERVER['HTTP_X_FORWARDED_HOST'])) && (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
) { ) {
// Forced to use public url when being forwarder by a reverse proxy. // Forced to use public url when being forwarder by a reverse proxy.
$fullurl = $config['public_url']; $fullurl = $config['public_url'];
if (substr($fullurl, -1) != '/') {
$fullurl .= '/';
}
$proxy = true; $proxy = true;
} else { } else {
$fullurl = $protocol.'://'.$_SERVER['SERVER_NAME']; $fullurl = $protocol.'://'.$_SERVER['SERVER_NAME'];