From 9f3ad33b28dc4c82f4b942428ae303ec2e0ca61e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 27 Apr 2021 18:44:06 +0200
Subject: [PATCH 1/4] Reference to base public_dashboard url

---
 pandora_console/views/dashboard/header.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index 64626056dd..c04e22023a 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -128,7 +128,10 @@ $queryPublic = [
     'pure'        => 1,
 ];
 $publicUrl = ui_get_full_url(
-    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic)
+    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic),
+    false,
+    false,
+    false
 );
 $publiclink['text'] = '<a id="public_link" href="'.$publicUrl.'" target="_blank">';
 $publiclink['text'] .= html_print_image(

From e1810cc36fbcc7360185cc6b7a076008dce4ca18 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 28 Apr 2021 09:50:04 +0200
Subject: [PATCH 2/4] Different way to fix public dashboard

---
 pandora_console/views/dashboard/header.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index c04e22023a..64626056dd 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -128,10 +128,7 @@ $queryPublic = [
     'pure'        => 1,
 ];
 $publicUrl = ui_get_full_url(
-    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic),
-    false,
-    false,
-    false
+    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic)
 );
 $publiclink['text'] = '<a id="public_link" href="'.$publicUrl.'" target="_blank">';
 $publiclink['text'] .= html_print_image(

From 2fb54dabf102bf11c3d38fdb0557e84785fdfafd Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 7 May 2021 10:47:05 +0200
Subject: [PATCH 3/4] Avoid change path while adding resources in certain
 situations

---
 pandora_console/include/functions_ui.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2e2e4b5958..7ce7a090f8 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1483,7 +1483,7 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
         return false;
     }
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
         $config['css'][$name] = '/../../'.$filename;
     } else {
         $config['css'][$name] = $filename;
@@ -1535,7 +1535,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
         return false;
     }
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
         $config['js'][$name] = '../../'.$filename;
     } else {
         $config['js'][$name] = $filename;

From fe932a0dd6508d8de8c6f48c7a9498556dfc84ec Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 7 May 2021 10:50:25 +0200
Subject: [PATCH 4/4] avoid some warnings

---
 pandora_console/include/functions_ui.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 7ce7a090f8..68f19d01e0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1483,7 +1483,10 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
         return false;
     }
 
-    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
+    if (is_metaconsole()
+        && (isset($config['requirements_use_base_url']) === false
+        || $config['requirements_use_base_url'] === false)
+    ) {
         $config['css'][$name] = '/../../'.$filename;
     } else {
         $config['css'][$name] = $filename;
@@ -1535,7 +1538,10 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
         return false;
     }
 
-    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
+    if (is_metaconsole()
+        && (isset($config['requirements_use_base_url']) === false
+        || $config['requirements_use_base_url'] === false)
+    ) {
         $config['js'][$name] = '../../'.$filename;
     } else {
         $config['js'][$name] = $filename;