diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index f61c89c106..322496228d 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4290,10 +4290,6 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me if (substr($fullurl, -1) != '/') { $fullurl .= '/'; } - - if ($url == 'index.php' && is_metaconsole()) { - $fullurl .= ENTERPRISE_DIR.'/meta'; - } } else if (!empty($config['public_url']) && (!empty($_SERVER['HTTP_X_FORWARDED_HOST'])) ) { @@ -4332,34 +4328,18 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me // Only add the home url. $url = $config['homeurl_static'].'/'; } - - if (is_metaconsole() && $metaconsole_root) { - $url .= 'enterprise/meta/'; - } } else if (!strstr($url, '.php')) { if ($proxy) { $fullurl .= '/'; } else { $fullurl .= $config['homeurl_static'].'/'; } - - if (is_metaconsole() && $metaconsole_root) { - $fullurl .= 'enterprise/meta/'; - } } else { - if ($proxy) { - if (is_metaconsole() && $metaconsole_root) { - $fullurl .= 'enterprise/meta/'; - } - } else { + if ((bool) $proxy === false) { if ($add_name_php_file) { $fullurl .= $_SERVER['SCRIPT_NAME']; } else { $fullurl .= $config['homeurl_static'].'/'; - - if (is_metaconsole() && $metaconsole_root) { - $fullurl .= 'enterprise/meta/'; - } } } } @@ -4374,6 +4354,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) { + $fullurl .= 'enterprise/meta/'; + } + return $fullurl.$url; }