From 8772dfe01790d18563ab1ca9ae908f6eee4cf110 Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Wed, 10 Aug 2022 11:18:27 +0200
Subject: [PATCH 1/2] add historical database setup in metaconsole
 pandora_enterprise#8791

---
 pandora_console/include/functions_ui.php      | 19 +++++++++++--------
 .../include/lib/Core/DBMaintainer.php         |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d30171eba3..9db7f80fb7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4101,17 +4101,20 @@ function ui_toggle(
     // JQuery Toggle.
     $output .= '<script type="text/javascript">'."\n";
     $output .= '	var hide_tgl_ctrl_'.$uniqid.' = '.(int) $hidden_default.";\n";
+    $output .= '	var is_metaconsole = '.(int) is_metaconsole().";\n";
     $output .= '	/* <![CDATA[ */'."\n";
     $output .= "	$(document).ready (function () {\n";
     $output .= "		$('#checkbox-".$switch_name."').click(function() {\n";
-    $output .= '            if (hide_tgl_ctrl_'.$uniqid.") {\n";
-    $output .= '				hide_tgl_ctrl_'.$uniqid." = 0;\n";
-    $output .= "				$('#tgl_div_".$uniqid."').toggle();\n";
-    $output .= "			}\n";
-    $output .= "			else {\n";
-    $output .= '				hide_tgl_ctrl_'.$uniqid." = 1;\n";
-    $output .= "				$('#tgl_div_".$uniqid."').toggle();\n";
-    $output .= "			}\n";
+    $output .= '            if (is_metaconsole == 0) {';
+    $output .= '                if (hide_tgl_ctrl_'.$uniqid.") {\n";
+    $output .= '			    	hide_tgl_ctrl_'.$uniqid." = 0;\n";
+    $output .= "			    	$('#tgl_div_".$uniqid."').toggle();\n";
+    $output .= "			    }\n";
+    $output .= "			    else {\n";
+    $output .= '			    	hide_tgl_ctrl_'.$uniqid." = 1;\n";
+    $output .= "			    	$('#tgl_div_".$uniqid."').toggle();\n";
+    $output .= "			    }\n";
+    $output .= "		    }\n";
     $output .= "		});\n";
     $output .= "		$('#tgl_ctrl_".$uniqid."').click(function() {\n";
     $output .= '			if (hide_tgl_ctrl_'.$uniqid.") {\n";
diff --git a/pandora_console/include/lib/Core/DBMaintainer.php b/pandora_console/include/lib/Core/DBMaintainer.php
index 88841c5990..b1e43a7a70 100644
--- a/pandora_console/include/lib/Core/DBMaintainer.php
+++ b/pandora_console/include/lib/Core/DBMaintainer.php
@@ -137,7 +137,7 @@ final class DBMaintainer
         $this->host = $params['host'];
         $this->port = $params['port'];
         $this->name = $params['name'];
-        $this->charset = $params['charset'];
+        $this->charset = (isset($params['charset']) === true) ? $params['charset'] : '';
 
         // Try to connect.
         $this->connect();

From f688f73c46b1feb03a76cb833ba71837913a7d3a Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Wed, 21 Sep 2022 16:35:36 +0200
Subject: [PATCH 2/2] fixed historical database pandora_enterprise#8791

---
 pandora_console/include/lib/Core/Config.php       | 4 ++--
 pandora_console/include/lib/Core/DBMaintainer.php | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/lib/Core/Config.php b/pandora_console/include/lib/Core/Config.php
index 3030491202..dbed566598 100644
--- a/pandora_console/include/lib/Core/Config.php
+++ b/pandora_console/include/lib/Core/Config.php
@@ -73,7 +73,7 @@ final class Config
                 $config['history_db_user'],
                 io_output_password($config['history_db_pass']),
                 $config['history_db_name'],
-                $config['history_db_port']
+                (int) $config['history_db_port']
             );
 
             if ($rc === false) {
@@ -84,7 +84,7 @@ final class Config
                     $config['history_db_name'],
                     $config['history_db_user'],
                     io_output_password($config['history_db_pass']),
-                    $config['history_db_port'],
+                    (int) $config['history_db_port'],
                     false
                 );
             }
diff --git a/pandora_console/include/lib/Core/DBMaintainer.php b/pandora_console/include/lib/Core/DBMaintainer.php
index b1e43a7a70..35d3e969d6 100644
--- a/pandora_console/include/lib/Core/DBMaintainer.php
+++ b/pandora_console/include/lib/Core/DBMaintainer.php
@@ -135,7 +135,7 @@ final class DBMaintainer
         $this->user = $params['user'];
         $this->pass = io_output_password($params['pass']);
         $this->host = $params['host'];
-        $this->port = $params['port'];
+        $this->port = (int) $params['port'];
         $this->name = $params['name'];
         $this->charset = (isset($params['charset']) === true) ? $params['charset'] : '';
 
@@ -170,7 +170,10 @@ final class DBMaintainer
         if ($rc === false) {
             $this->dbh = null;
             $this->connected = false;
-            $this->lastError = __('Connection problems');
+            $this->lastError = __(
+                'Connection problems: %s',
+                mysqli_connect_error()
+            );
         } else {
             $dbc = new \mysqli(
                 $this->host,