From 8764413597018b25be321f5f940aa09a205868c7 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 6 Oct 2021 15:07:46 +0200 Subject: [PATCH] Some ui_get_full_url improvements --- pandora_console/include/functions_ui.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 322496228d..22f98a57bf 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4315,18 +4315,15 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me } } - if ($url === '') { - if ($proxy) { - $url = ''; - } else { + $skip_meta_tag = false; + if (empty($url) === true) { + if ($proxy === false) { $url = $_SERVER['REQUEST_URI']; - } - } else if ($url === false) { - if ($proxy) { - $url = ''; + // Already inserted in request_uri. + $skip_meta_tag = true; } else { - // Only add the home url. - $url = $config['homeurl_static'].'/'; + // Redirect to main. + $url = '?'.$_SERVER['QUERY_STRING']; } } else if (!strstr($url, '.php')) { if ($proxy) { @@ -4354,7 +4351,10 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me $url = substr($url, 1); } - if (is_metaconsole() && $metaconsole_root) { + if ($skip_meta_tag === false + && $metaconsole_root + && is_metaconsole() + ) { $fullurl .= 'enterprise/meta/'; }