tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some ui_get_full_url improvements

Browse Source
This commit is contained in:
fbsanchez 2021-10-06 15:13:21 +02:00
parent 8764413597
commit 35eb1d0790
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/functions_ui.php
View File

@ -4316,7 +4316,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
} }
$skip_meta_tag = false; $skip_meta_tag = false;
if (empty($url) === true) { if ($url === '') {
if ($proxy === false) { if ($proxy === false) {
$url = $_SERVER['REQUEST_URI']; $url = $_SERVER['REQUEST_URI'];
// Already inserted in request_uri. // Already inserted in request_uri.
@ -4325,6 +4325,17 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
// Redirect to main. // Redirect to main.
$url = '?'.$_SERVER['QUERY_STRING']; $url = '?'.$_SERVER['QUERY_STRING'];
} }
} else if (empty($url) === true) {
if ($proxy === false) {
$url = $config['homeurl_static'].'/';
if ($metaconsole_root === true) {
$url = $config['homeurl_static'].'/'.ENTERPRISE_DIR.'/meta/';
}
$skip_meta_tag = true;
} else {
$url = '';
}
} else if (!strstr($url, '.php')) { } else if (!strstr($url, '.php')) {
if ($proxy) { if ($proxy) {
$fullurl .= '/'; $fullurl .= '/';
@ -4355,7 +4366,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
&& $metaconsole_root && $metaconsole_root
&& is_metaconsole() && is_metaconsole()
) { ) {
$fullurl .= 'enterprise/meta/'; $fullurl .= ENTERPRISE_DIR.'/meta/';
} }
return $fullurl.$url; return $fullurl.$url;