From 3ecf171fdbbe9e1473c431f1feb8c400f71f8ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= <felix.suarez@pandorafms.com>
Date: Tue, 1 Aug 2023 18:14:11 -0600
Subject: [PATCH 01/62] Ignore disabled nodes

---
 pandora_server/util/pandora_ha.pl | 45 +++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/pandora_server/util/pandora_ha.pl b/pandora_server/util/pandora_ha.pl
index 941b6dc854..be54f8d0ca 100755
--- a/pandora_server/util/pandora_ha.pl
+++ b/pandora_server/util/pandora_ha.pl
@@ -361,7 +361,7 @@ sub ha_load_databases($) {
     return unless defined($conf->{'ha_hosts'});
 
     @HA_DB_Hosts = grep { !/^#/ } map { s/^\s+|\s+$//g; $_; } split(/,/, $conf->{'ha_hosts'});
-    log_message($conf, 'DEBUG', "Loaded databases from disk (@HA_DB_Hosts)");
+    log_message($conf, 'DEBUG', "Loaded databases from disk (@HA_DB_Hosts)");  
 }
 
 ###############################################################################
@@ -388,9 +388,20 @@ sub ha_database_connect_pandora($) {
 
 	# Load the list of HA databases.
 	ha_load_databases($conf);
-
+  
 	# Select a new master database.
 	my ($dbh, $utimestamp, $max_utimestamp) = (undef, undef, -1);
+
+  my @disabled_nodes = get_disabled_nodes($conf);
+
+  # If there are disabled nodes ignore them from the HA_DB_Hosts.
+  if(scalar @disabled_nodes ne 0){
+    @HA_DB_Hosts = grep { my $item = $_; !grep { $_ eq $item } @disabled_nodes } @HA_DB_Hosts;
+
+    my $data = join(",", @disabled_nodes);
+    log_message($conf, 'LOG', "Ignoring disabled hosts: " . $data);
+  }
+
 	foreach my $ha_dbhost (@HA_DB_Hosts) {
 
 		# Retry each database ha_connect_retries times.
@@ -481,6 +492,36 @@ sub ha_restart_pandora($) {
     `$config->{'pandora_service_cmd'} $control_command 2>/dev/null`;
 }
 
+###############################################################################
+# Get ip of the disabled nodes.
+###############################################################################
+sub get_disabled_nodes($) {
+  my ($conf) = @_;
+  
+  my $dbh = db_connect('mysql',
+						  $conf->{'dbname'},
+						  $conf->{'dbhost'},
+						  $conf->{'dbport'},
+						  $conf->{'ha_dbuser'},
+						  $conf->{'ha_dbpass'});
+
+  my $disabled_nodes = get_db_value($dbh, "SELECT value FROM tconfig WHERE token = 'ha_disabled_nodes'");
+  
+  if(!defined($disabled_nodes) || $disabled_nodes eq ""){
+    $disabled_nodes = ',';
+  }
+
+  my @disabled_nodes = split(',', $disabled_nodes);
+
+  if(scalar @disabled_nodes ne 0){
+    $disabled_nodes = join(",", @disabled_nodes);
+    @disabled_nodes = get_db_rows($dbh, "SELECT host FROM tdatabase WHERE id IN ($disabled_nodes)");
+    @disabled_nodes = map { $_->{host} } @disabled_nodes;
+  }
+
+  return @disabled_nodes;
+}
+
 ###############################################################################
 # Main (Pacemaker)
 ###############################################################################

From 9c9467c2da9961f32606cabe098839eb437caa94 Mon Sep 17 00:00:00 2001
From: alejandro <alejandro.sanchez@pandorafms.com>
Date: Mon, 14 Aug 2023 13:57:14 +0200
Subject: [PATCH 02/62] fix in plugin output

---
 pandora_server/util/plugin/wizard_wmi_module.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_server/util/plugin/wizard_wmi_module.pl b/pandora_server/util/plugin/wizard_wmi_module.pl
index 23e49a7f83..d9c1b3d1aa 100755
--- a/pandora_server/util/plugin/wizard_wmi_module.pl
+++ b/pandora_server/util/plugin/wizard_wmi_module.pl
@@ -172,5 +172,6 @@ foreach my $k (keys %{$fields_values}){
 # Get operation result
 my $result = eval $operation;
 if (defined($result)){
-	print $result . "\n";
+	
+	print $result, "\n"; 
 }

From 682494f51fa15479cdefacbf6347838e3423fa19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1nchez?=
 <alejandro.sanchez@pandorafms.com>
Date: Mon, 14 Aug 2023 11:59:41 +0000
Subject: [PATCH 03/62] remove clear line

---
 pandora_server/util/plugin/wizard_wmi_module.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_server/util/plugin/wizard_wmi_module.pl b/pandora_server/util/plugin/wizard_wmi_module.pl
index d9c1b3d1aa..fa25c26d0b 100755
--- a/pandora_server/util/plugin/wizard_wmi_module.pl
+++ b/pandora_server/util/plugin/wizard_wmi_module.pl
@@ -172,6 +172,5 @@ foreach my $k (keys %{$fields_values}){
 # Get operation result
 my $result = eval $operation;
 if (defined($result)){
-	
 	print $result, "\n"; 
 }

From 64d2d78137ef966d4f27d47c374a16e863bf6d1b Mon Sep 17 00:00:00 2001
From: Jorge Rincon <jorge.rincon@pandorafms.com>
Date: Wed, 6 Sep 2023 13:59:12 +0200
Subject: [PATCH 04/62] #11014 fixed responsive user QR code

---
 pandora_console/include/styles/pandora.css | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index d87d959ac5..a1821011d7 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -12566,3 +12566,31 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
 .ui-date-range-in > a {
   background-color: #81b92e3b !important;
 }
+
+@media screen and (min-width: 1190px) and (max-width: 1290px) {
+  #api_qrcode_display {
+    left: 580px;
+  }
+}
+
+@media screen and (min-width: 1143px) and (max-width: 1189px) {
+  #api_qrcode_display {
+    left: 528px;
+  }
+}
+
+@media screen and (min-width: 860px) and (max-width: 1142px) {
+  #api_qrcode_display {
+    left: 356px;
+    top: 120px;
+  }
+
+  .font-title-font {
+    line-height: 0;
+  }
+
+  #qr_code_agent_view > img {
+    width: 250px;
+    height: 250px;
+  }
+}

From d5c24609d61f7cc38f2b5a8b28db8580a918e4c6 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 30 Nov 2023 11:21:54 +0100
Subject: [PATCH 05/62] add tables merge process pandora_enterprise#12352

---
 pandora_console/extras/mr/68.sql | 40 +++++++++++++++++++++++++++++
 pandora_console/pandoradb.sql    | 43 ++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 pandora_console/extras/mr/68.sql

diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql
new file mode 100644
index 0000000000..999d8e6c3c
--- /dev/null
+++ b/pandora_console/extras/mr/68.sql
@@ -0,0 +1,40 @@
+START TRANSACTION;
+
+DROP TABLE IF EXISTS `tmerge_error`;
+CREATE TABLE IF NOT EXISTS `tmerge_error` (
+    `id` int(10) NOT NULL auto_increment,
+    `id_node` int(10) default 0,
+    `phase` int(10) default 0,
+    `step` int(10) default 0,
+    `msg` LONGTEXT default "",
+    `action` text default "",
+    `utimestamp` int(20) unsigned NOT NULL default 0,
+    PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+DROP TABLE IF EXISTS `tmerge_steps`;
+CREATE TABLE IF NOT EXISTS `tmerge_steps` (
+    `id` int(10) NOT NULL auto_increment,
+    `id_node` int(10) default 0,
+    `phase` int(10) default 0,
+    `total` int(10) default 0,
+    `step` int(10) default 0,
+    `debug` varchar(1024) default "",
+    `action` varchar(100) default "",
+    `affected` varchar(100) default "",
+    `query` mediumtext default "",
+    `utimestamp` int(20) unsigned NOT NULL default 0,
+    PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+DROP TABLE IF EXISTS `tmerge_queries`;
+CREATE TABLE IF NOT EXISTS `tmerge_queries` (
+    `steps` int(10) NOT NULL auto_increment,
+    `action` varchar(100) default "",
+    `affected` varchar(100) default "",
+    `utimestamp` int(20) unsigned NOT NULL default 0,
+    `query` LONGTEXT NOT NULL default "",
+    PRIMARY KEY  (`steps`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+COMMIT;
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index b98f706667..78a7833861 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -4534,4 +4534,47 @@ CREATE TABLE IF NOT EXISTS `tpandora_cve` (
     `cvss_score` DOUBLE DEFAULT NULL,
     `cvss_vector` VARCHAR(255) DEFAULT NULL,
 PRIMARY KEY (`cve_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+-- ---------------------------------------------------------------------
+-- Table `tmerge_error`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tmerge_error` (
+    `id` int(10) NOT NULL auto_increment,
+    `id_node` int(10) default 0,
+    `phase` int(10) default 0,
+    `step` int(10) default 0,
+    `msg` LONGTEXT default "",
+    `action` text default "",
+    `utimestamp` int(20) unsigned NOT NULL default 0,
+    PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+-- ---------------------------------------------------------------------
+-- Table `tmerge_steps`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tmerge_steps` (
+    `id` int(10) NOT NULL auto_increment,
+    `id_node` int(10) default 0,
+    `phase` int(10) default 0,
+    `total` int(10) default 0,
+    `step` int(10) default 0,
+    `debug` varchar(1024) default "",
+    `action` varchar(100) default "",
+    `affected` varchar(100) default "",
+    `query` mediumtext default "",
+    `utimestamp` int(20) unsigned NOT NULL default 0,
+    PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
+
+-- ---------------------------------------------------------------------
+-- Table `tmerge_queries`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tmerge_queries` (
+    `steps` int(10) NOT NULL auto_increment,
+    `action` varchar(100) default "",
+    `affected` varchar(100) default "",
+    `utimestamp` int(20) unsigned NOT NULL default 0,
+    `query` LONGTEXT NOT NULL default "",
+    PRIMARY KEY  (`steps`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
\ No newline at end of file

From 9da2ad8682b69f929e97dfdb27ce2017d79ff25c Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 1 Dec 2023 09:26:48 +0100
Subject: [PATCH 06/62] add tables merge process pandora_enterprise#12352

---
 pandora_console/extras/mr/68.sql | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql
index 999d8e6c3c..c0e5788091 100644
--- a/pandora_console/extras/mr/68.sql
+++ b/pandora_console/extras/mr/68.sql
@@ -1,6 +1,5 @@
 START TRANSACTION;
 
-DROP TABLE IF EXISTS `tmerge_error`;
 CREATE TABLE IF NOT EXISTS `tmerge_error` (
     `id` int(10) NOT NULL auto_increment,
     `id_node` int(10) default 0,
@@ -12,7 +11,8 @@ CREATE TABLE IF NOT EXISTS `tmerge_error` (
     PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
-DROP TABLE IF EXISTS `tmerge_steps`;
+ALTER TABLE `tmerge_error` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+
 CREATE TABLE IF NOT EXISTS `tmerge_steps` (
     `id` int(10) NOT NULL auto_increment,
     `id_node` int(10) default 0,
@@ -27,7 +27,8 @@ CREATE TABLE IF NOT EXISTS `tmerge_steps` (
     PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
-DROP TABLE IF EXISTS `tmerge_queries`;
+ALTER TABLE `tmerge_steps` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+
 CREATE TABLE IF NOT EXISTS `tmerge_queries` (
     `steps` int(10) NOT NULL auto_increment,
     `action` varchar(100) default "",
@@ -37,4 +38,6 @@ CREATE TABLE IF NOT EXISTS `tmerge_queries` (
     PRIMARY KEY  (`steps`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
+ALTER TABLE `tmerge_queries` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+
 COMMIT;

From cc1c138552271abbcf2804f6bce13e46dc19df73 Mon Sep 17 00:00:00 2001
From: Jorge Rincon <jorge.rincon@pandorafms.com>
Date: Mon, 4 Dec 2023 11:23:43 +0100
Subject: [PATCH 07/62] #12518 Fixed up custom field type link

---
 pandora_console/operation/agentes/estado_generalagente.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index dd4effe693..6e6615df51 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -298,8 +298,9 @@ foreach ($fields as $field) {
         if ($custom_value[0]['is_password_type']) {
                 $data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
         } else if ($field['is_link_enabled'] === '1') {
-            list($link_text, $link_url) = json_decode($custom_value[0]['description'], true);
-
+            $custom_link_type = io_safe_output($custom_value[0]['description']);
+            $custom_link_type = json_decode($custom_link_type);
+            list($link_text, $link_url) = $custom_link_type;
             if (json_last_error() !== JSON_ERROR_NONE) {
                 $link_text = '';
                 $link_url = '';
@@ -309,7 +310,7 @@ foreach ($fields as $field) {
                 $link_text = $link_url;
             }
 
-            $data[1] = '<a href="'.$link_url.'">'.$link_text.'</a>';
+            $data[1] = '<a target="_blank" href="'.$link_url.'">'.$link_text.'</a>';
         } else {
             $custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
             $data[1] = $custom_value[0]['description'];

From 8a92b39eee596013fc4b95eedd425e5fe599999e Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 4 Dec 2023 11:59:31 +0100
Subject: [PATCH 08/62] add new filters widget modules status
 pandora_enterprise#12267

---
 pandora_console/include/ajax/module.php       |  33 +++
 .../lib/Dashboard/Widgets/ModulesByStatus.php | 278 +++++++-----------
 2 files changed, 145 insertions(+), 166 deletions(-)

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index e4eba79858..c3e099f0cb 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1851,6 +1851,8 @@ if (check_login()) {
 
         $table_id = get_parameter('table_id', '');
         $search = get_parameter('search', '');
+        $search_agent = get_parameter('search_agent', '');
+        $groupId = (int) get_parameter('groupId', 0);
         $module_name = get_parameter('module_name', '');
         $status = get_parameter('status', '');
         $start = get_parameter('start', 0);
@@ -1862,13 +1864,36 @@ if (check_login()) {
         $nodes = get_parameter('nodes', 0);
         $disabled_modules = (bool) get_parameter('disabled_modules', false);
 
+        $groups_array = [];
+        if ($groupId === 0) {
+            if (users_can_manage_group_all('AR') === false) {
+                $groups_array = users_get_groups(false, 'AR', false);
+            }
+        } else {
+            $groups_array = [$groupId];
+        }
+
         $where = '1=1';
         $recordsTotal = 0;
 
+        if (empty($groups_array) === false) {
+            $where .= sprintf(
+                ' AND (tagente.id_grupo IN (%s)
+                    OR tagent_secondary_group.id_group IN(%s))',
+                implode(',', $groups_array),
+                implode(',', $groups_array)
+            );
+        }
+
+
         if (empty($search) === false) {
             $where .= ' AND tagente_modulo.nombre LIKE "%%'.$search.'%%"';
         }
 
+        if (empty($search_agent) === false) {
+            $where .= ' AND tagente.alias LIKE "%%'.$search_agent.'%%"';
+        }
+
         if (str_contains($status, '6') === true) {
             $expl = explode(',', $status);
             $exist = array_search('6', $expl);
@@ -1943,6 +1968,8 @@ if (check_login()) {
                     ON tagente_modulo.id_agente = tagente.id_agente 
                 INNER JOIN tagente_estado
                     ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                LEFT JOIN tagent_secondary_group
+					ON tagente.id_agente = tagent_secondary_group.id_agent
                 WHERE %s
                 ORDER BY %s
                 LIMIT %d, %d',
@@ -1960,6 +1987,8 @@ if (check_login()) {
                     ON tagente_modulo.id_agente = tagente.id_agente 
                 INNER JOIN tagente_estado
                     ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                LEFT JOIN tagent_secondary_group
+					ON tagente.id_agente = tagent_secondary_group.id_agent
                 WHERE %s',
                 $where
             );
@@ -1987,6 +2016,8 @@ if (check_login()) {
                             ON tagente_modulo.id_agente = tagente.id_agente 
                         INNER JOIN tagente_estado
                             ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                        LEFT JOIN tagent_secondary_group
+					        ON tagente.id_agente = tagent_secondary_group.id_agent
                         WHERE %s',
                         $where
                     );
@@ -2019,6 +2050,8 @@ if (check_login()) {
                         ON tagente_modulo.id_agente = tagente.id_agente 
                     INNER JOIN tagente_estado
                         ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                    LEFT JOIN tagent_secondary_group
+					    ON tagente.id_agente = tagent_secondary_group.id_agent
                     WHERE %s',
                     $where
                 );
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index e490135734..86a6cde7ed 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -200,6 +200,14 @@ class ModulesByStatus extends Widget
         // Retrieve global - common inputs.
         $values = parent::decoders($decoder);
 
+        if (isset($decoder['groupId']) === true) {
+            $values['groupId'] = $decoder['groupId'];
+        }
+
+        if (isset($decoder['search_agent']) === true) {
+            $values['search_agent'] = $decoder['search_agent'];
+        }
+
         if (isset($decoder['search']) === true) {
             $values['search'] = $decoder['search'];
         }
@@ -240,9 +248,39 @@ class ModulesByStatus extends Widget
         // Retrieve global - common inputs.
         $inputs = parent::getFormInputs();
 
+        $return_all_group = false;
+        if (users_can_manage_group_all('RM') || $values['groupId'] == 0) {
+            $return_all_group = true;
+        }
+
+        // Groups.
+        $inputs[] = [
+            'label'     => __('Group'),
+            'arguments' => [
+                'type'           => 'select_groups',
+                'name'           => 'groupId',
+                'returnAllGroup' => $return_all_group,
+                'privilege'      => 'AR',
+                'selected'       => $values['groupId'],
+                'return'         => true,
+            ],
+        ];
+
+        // Search Agent.
+        $inputs[] = [
+            'label'     => __('Search agent').ui_print_help_tip(__('Search filter by Agent name field content'), true),
+            'arguments' => [
+                'name'   => 'search_agent',
+                'type'   => 'text',
+                'value'  => $values['search_agent'],
+                'return' => true,
+                'size'   => 0,
+            ],
+        ];
+
         // Search.
         $inputs[] = [
-            'label'     => __('Free search').ui_print_help_tip(__('Search filter by Module name field content'), true),
+            'label'     => __('Search module').ui_print_help_tip(__('Search filter by Module name field content'), true),
             'arguments' => [
                 'name'   => 'search',
                 'type'   => 'text',
@@ -373,7 +411,9 @@ class ModulesByStatus extends Widget
         // Retrieve global - common inputs.
         $values = parent::getPost();
 
+        $values['groupId'] = \get_parameter('groupId', 0);
         $values['search'] = \get_parameter('search', '');
+        $values['search_agent'] = \get_parameter('search_agent', '');
         $values['status'] = \get_parameter('status', '');
         $values['limit'] = \get_parameter('limit', '');
         $values['nodes'] = \get_parameter('nodes', '');
@@ -386,173 +426,73 @@ class ModulesByStatus extends Widget
     /**
      * Draw widget.
      *
-     * @return string;
+     * @return void Html output;
      */
     public function load()
     {
-        $this->size = parent::getSize();
+        // Datatables list.
+        try {
+            $info_columns = $this->columns();
+            $column_names = $info_columns['column_names'];
+            $columns = $info_columns['columns'];
+            $hash = get_parameter('auth_hash', '');
+            $id_user = get_parameter('id_user', '');
 
-        global $config;
-
-        $output = '';
-
-        if (is_metaconsole() === true) {
-            $modules = [];
-
-            $servers_ids = array_column(metaconsole_get_servers(), 'id');
-
-            foreach ($servers_ids as $server_id) {
-                try {
-                    $node = new Node((int) $server_id);
-
-                    $node->connect();
-                    $modules_tmp = $this->getInfoModules(
-                        $this->values['search'],
-                        $this->values['status'],
-                        $this->values['nodes']
-                    );
-                    $modules[$node->id()] = $modules_tmp[0];
-                    $node->disconnect();
-                } catch (\Exception $e) {
-                    // Unexistent modules.
-                    $node->disconnect();
-                }
-            }
-        } else {
-            $modules = $this->getInfoModules(
-                $this->values['search'],
-                $this->values['status']
+            $tableId = 'ModuleByStatus_'.$this->dashboardId.'_'.$this->cellId;
+            // Load datatables user interface.
+            ui_print_datatable(
+                [
+                    'id'                 => $tableId,
+                    'class'              => 'info_table align-left-important',
+                    'style'              => 'width: 100%',
+                    'columns'            => $columns,
+                    'column_names'       => $column_names,
+                    'ajax_url'           => 'include/ajax/module',
+                    'ajax_data'          => [
+                        'get_data_ModulesByStatus' => 1,
+                        'table_id'                 => $tableId,
+                        'search_agent'             => $this->values['search_agent'],
+                        'search'                   => $this->values['search'],
+                        'groupId'                  => $this->values['groupId'],
+                        'status'                   => $this->values['status'],
+                        'nodes'                    => $this->values['nodes'],
+                        'disabled_modules'         => $this->values['disabled_modules'],
+                        'auth_hash'                => $hash,
+                        'auth_class'               => 'PandoraFMS\Dashboard\Manager',
+                        'id_user'                  => $id_user,
+                    ],
+                    'default_pagination' => $this->values['limit'],
+                    'order'              => [
+                        'field'     => 'last_status_change',
+                        'direction' => 'desc',
+                    ],
+                    'csv'                => 0,
+                    'pagination_options' => [
+                        [
+                            5,
+                            10,
+                            25,
+                            100,
+                            200,
+                            500,
+                            1000,
+                        ],
+                        [
+                            5,
+                            10,
+                            25,
+                            100,
+                            200,
+                            500,
+                            1000,
+                        ],
+                    ],
+                    'dom_elements'       => 'frtilp',
+                ]
             );
+        } catch (\Exception $e) {
+            echo $e->getMessage();
         }
-
-        if ($modules !== false && empty($modules) === false) {
-            // Datatables list.
-            try {
-                $info_columns = $this->columns();
-                $column_names = $info_columns['column_names'];
-                $columns = $info_columns['columns'];
-                $hash = get_parameter('auth_hash', '');
-                $id_user = get_parameter('id_user', '');
-
-                $tableId = 'ModuleByStatus_'.$this->dashboardId.'_'.$this->cellId;
-                // Load datatables user interface.
-                ui_print_datatable(
-                    [
-                        'id'                 => $tableId,
-                        'class'              => 'info_table align-left-important',
-                        'style'              => 'width: 100%',
-                        'columns'            => $columns,
-                        'column_names'       => $column_names,
-                        'ajax_url'           => 'include/ajax/module',
-                        'ajax_data'          => [
-                            'get_data_ModulesByStatus' => 1,
-                            'table_id'                 => $tableId,
-                            'search'                   => $this->values['search'],
-                            'status'                   => $this->values['status'],
-                            'nodes'                    => $this->values['nodes'],
-                            'disabled_modules'         => $this->values['disabled_modules'],
-                            'auth_hash'                => $hash,
-                            'auth_class'               => 'PandoraFMS\Dashboard\Manager',
-                            'id_user'                  => $id_user,
-                        ],
-                        'default_pagination' => $this->values['limit'],
-                        'order'              => [
-                            'field'     => 'last_status_change',
-                            'direction' => 'desc',
-                        ],
-                        'csv'                => 0,
-                        'pagination_options' => [
-                            [
-                                5,
-                                10,
-                                25,
-                                100,
-                                200,
-                                500,
-                                1000,
-                            ],
-                            [
-                                5,
-                                10,
-                                25,
-                                100,
-                                200,
-                                500,
-                                1000,
-                            ],
-                        ],
-                        'dom_elements'       => 'frtilp',
-                    ]
-                );
-            } catch (\Exception $e) {
-                echo $e->getMessage();
-            }
-        } else {
-            $output = '';
-            $output .= '<div class="container-center">';
-            $output .= \ui_print_info_message(
-                __('Not found modules'),
-                '',
-                true
-            );
-            $output .= '</div>';
-
-            return $output;
-        }
-    }
-
-
-    /**
-     * Get info modules.
-     *
-     * @param string $search Free search.
-     * @param string $status Modules status.
-     *
-     * @return array Data.
-     */
-    private function getInfoModules(string $search, string $status): array
-    {
-        if (empty($search) === false) {
-            $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND ';
-        }
-
-        if (str_contains($status, '6') === true) {
-            $expl = explode(',', $status);
-            $exist = array_search('6', $expl);
-            if (isset($exist) === true) {
-                unset($expl[$exist]);
-            }
-
-            array_push($expl, '1', '2');
-
-            $status = implode(',', $expl);
-        }
-
-        $where .= sprintf(
-            'tagente_estado.estado IN (%s)
-            AND tagente_modulo.delete_pending = 0',
-            $status
-        );
-
-        $sql = sprintf(
-            'SELECT
-            COUNT(*) AS "modules"
-            FROM tagente_modulo
-            INNER JOIN tagente
-                ON tagente_modulo.id_agente = tagente.id_agente 
-            INNER JOIN tagente_estado
-                ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
-            WHERE %s',
-            $where
-        );
-
-        $modules = db_get_all_rows_sql($sql);
-
-        if ($modules === false) {
-            $modules = [];
-        }
-
-        return $modules;
     }
 
 
@@ -579,7 +519,10 @@ class ModulesByStatus extends Widget
                 'nombre',
                 'alias',
                 'server_name',
-                'last_status_change',
+                [
+                    'text'  => 'last_status_change',
+                    'class' => 'flex-column',
+                ],
                 'estado',
             ];
         } else {
@@ -593,7 +536,10 @@ class ModulesByStatus extends Widget
             $columns = [
                 'nombre',
                 'alias',
-                'last_status_change',
+                [
+                    'text'  => 'last_status_change',
+                    'class' => 'flex-column',
+                ],
                 'estado',
             ];
         }
@@ -642,12 +588,12 @@ class ModulesByStatus extends Widget
             $height_counter = (((int) count($nodes_fields)) * 20);
 
             $size = [
-                'width'  => 450,
+                'width'  => 470,
                 'height' => (520 + $height_counter),
             ];
         } else {
             $size = [
-                'width'  => 450,
+                'width'  => 470,
                 'height' => 480,
             ];
         }

From 6e68e04027e999cbd052e90e9d1349ba09b74b74 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 4 Dec 2023 16:34:03 +0100
Subject: [PATCH 09/62] quit pagebreak pandora_enterprise#11605

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

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index dce7dd9efc..72c6fbd642 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -15847,8 +15847,8 @@ function reporting_translate_sla_status_for_graph($status)
  */
 function reporting_header_table_for_pdf($title='', $description='')
 {
-    $result_pdf = '<pagebreak>';
-    $result_pdf .= '<table class="header_table databox">';
+    // $result_pdf = '<pagebreak>';
+    $result_pdf = '<table class="header_table databox">';
     $result_pdf .= '<thead class="header_tr"><tr>';
     $result_pdf .= '<th class="th_first" colspan="2">';
     $result_pdf .= $title;

From 160514cfbe5acd41941de26f0ca5e31d2fa10a09 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Wed, 13 Dec 2023 10:08:13 +0100
Subject: [PATCH 10/62] fix filter bug

---
 pandora_console/include/functions_events.php | 7 ++++++-
 pandora_console/operation/events/events.php  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 747e5154ce..852d00f270 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -6472,7 +6472,12 @@ function event_print_graph(
             $color[] = '#82b92f';
         }
     } else {
-        $interval_length = (int) ($period / $num_intervals);
+        $interval_length = 0;
+
+        if ($num_intervals > 0) {
+            $interval_length = (int) ($period / $num_intervals);
+        }
+
         $intervals = [];
         $intervals[0] = $start_utimestamp;
         for ($i = 0; $i < $num_intervals; $i++) {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index be5f6047e3..f47fc71f55 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -1234,7 +1234,7 @@ if (is_ajax() === true) {
 
             $data = array_values(
                 array_filter(
-                    $data,
+                    ($data ?? []),
                     function ($item) {
                         return (bool) (array) $item;
                     }

From 29260473fce207f10c842c99ce89c83fa9a5d8f2 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Wed, 13 Dec 2023 13:29:48 +0100
Subject: [PATCH 11/62] fix missing fields

---
 .../godmode/events/event_responses.editor.php | 20 +++++++++----------
 pandora_console/include/styles/events.css     |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index ae31e10ad1..477aa70e85 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -285,7 +285,7 @@ if (enterprise_installed()) {
 $data = [];
 $data[0] = html_print_label_input_block(
     '<div id="server_to_exec_label" class="labels invisible">'.__('Server to execute command').'</div>',
-    '<div id="server_to_exec_value" class="invisible" >'.html_print_select(
+    '<div id="server_to_exec_value" class="w100p margin-top-10 invisible" >'.html_print_select(
         $servers_to_exec,
         'server_to_exec',
         $event_response['server_to_exec'],
@@ -298,7 +298,7 @@ $data[0] = html_print_label_input_block(
 
 $data[1] = html_print_label_input_block(
     '<div id="command_timeout_label" class="labels invisible">'.__('Command timeout (s)'),
-    '<div id="command_timeout_value" class="invisible">'.html_print_input_text(
+    '<div id="command_timeout_value" class=" w100p margin-top-10 invisible">'.html_print_input_text(
         'command_timeout',
         $event_response['command_timeout'],
         '',
@@ -358,18 +358,18 @@ $('#type').change(function() {
             $('#new_window option[value="0"]')
                 .prop('selected', true);
             $('#new_window').attr('disabled','disabled');
-            $('#server_to_exec_label').css('display','');
-            $('#server_to_exec_value').css('display','');
-            $('#command_timeout_label').css('display','');
-            $('#command_timeout_value').css('display','');
+            $('#server_to_exec_label').show();
+            $('#server_to_exec_value').show();
+            $('#command_timeout_label').show();
+            $('#command_timeout_value').show();
 
             break;
         case 'url':
             $('#new_window').removeAttr('disabled');
-            $('#server_to_exec_label').css('display','none');
-            $('#server_to_exec_value').css('display','none');
-            $('#command_timeout_label').css('display','none');
-            $('#command_timeout_value').css('display','none');
+            $('#server_to_exec_label').hide();
+            $('#server_to_exec_value').hide();
+            $('#command_timeout_label').hide();
+            $('#command_timeout_value').hide();
 
             break;
     }
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 1a66ba7174..2c1bc0d180 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -478,10 +478,10 @@ div.multi-response-buttons {
   justify-content: flex-start;
 }
 
-td:has(div#server_to_exec_label),
+/*td:has(div#server_to_exec_label),
 td:has(div#server_to_exec_value) {
   padding: 0px;
-}
+}*/
 
 table#save_filter_form,
 table#load_filter_form {

From d6c47ca069d296197140f95d23f79e1230d2d296 Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Thu, 14 Dec 2023 16:21:22 -0600
Subject: [PATCH 12/62] Disable PrintError on DB

---
 pandora_server/lib/PandoraFMS/DB.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index c0ee332f64..9ee699a08c 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -1263,6 +1263,7 @@ sub db_delete_limit ($$$$;@) {
 sub db_insert ($$$;@) {
 	my ($dbh, $index, $query, @values) = @_;
 	my $insert_id = undef;
+	$dbh->{PrintError} = 0;
 
 	eval {	
 		$dbh->do($query, undef, @values);
@@ -1288,6 +1289,7 @@ sub db_insert ($$$;@) {
 sub db_update ($$;@) {
 	my ($dbh, $query, @values) = @_;
 	my $rows;
+	$dbh->{PrintError} = 0;
 
 	eval {
 		$rows = $dbh->do($query, undef, @values);
@@ -1533,7 +1535,8 @@ sub get_agent_addr_id ($$$) {
 ########################################################################
 sub db_do ($$;@) {
 	my ($dbh, $query, @values) = @_;
-	
+	$dbh->{PrintError} = 0;
+
 	#DBI->trace( 3, '/tmp/dbitrace.log' );
 	eval {
 		$dbh->do($query, undef, @values);

From 3d71d27d6b58a6b7d31815a82fa0469739d47df8 Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Sat, 16 Dec 2023 23:59:21 -0600
Subject: [PATCH 13/62] Change autodisabled  query

---
 pandora_server/lib/PandoraFMS/Core.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 84d3d51bd2..e6f61836e6 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -7187,10 +7187,18 @@ Puts all autodisable agents with all modules unknown on disabled mode
 sub pandora_disable_autodisable_agents ($$) {
 	my ($pa_config, $dbh) = @_;
 	
-	my $sql = 'SELECT id_agente FROM tagente
-			WHERE disabled=0 AND 
-			tagente.unknown_count>0 AND 
-			tagente.modo=2';
+
+	my $sql = 'SELECT id_agente
+				FROM (
+					SELECT tm.id_agente, count(*) as sync_modules, ta.unknown_count 
+					FROM tagente_modulo tm
+					JOIN tagente ta ON ta.id_agente = tm.id_agente 
+					WHERE ta.disabled = 0
+					AND NOT ((id_tipo_modulo >= 21 AND id_tipo_modulo <= 23) OR id_tipo_modulo = 100)
+					GROUP BY tm.id_agente
+				) AS subquery
+				WHERE subquery.unknown_count >= subquery.sync_modules;';
+
 	my @agents_autodisabled = get_db_rows ($dbh, $sql);
 	return if ($#agents_autodisabled < 0);
 	

From d348f1bf1db26d5b6048a7688c3a72fb21136884 Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Sun, 17 Dec 2023 00:01:47 -0600
Subject: [PATCH 14/62] Remove conf db change

---
 pandora_server/lib/PandoraFMS/DB.pm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 9ee699a08c..b417e44efd 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -1263,7 +1263,6 @@ sub db_delete_limit ($$$$;@) {
 sub db_insert ($$$;@) {
 	my ($dbh, $index, $query, @values) = @_;
 	my $insert_id = undef;
-	$dbh->{PrintError} = 0;
 
 	eval {	
 		$dbh->do($query, undef, @values);
@@ -1289,7 +1288,6 @@ sub db_insert ($$$;@) {
 sub db_update ($$;@) {
 	my ($dbh, $query, @values) = @_;
 	my $rows;
-	$dbh->{PrintError} = 0;
 
 	eval {
 		$rows = $dbh->do($query, undef, @values);
@@ -1535,7 +1533,6 @@ sub get_agent_addr_id ($$$) {
 ########################################################################
 sub db_do ($$;@) {
 	my ($dbh, $query, @values) = @_;
-	$dbh->{PrintError} = 0;
 
 	#DBI->trace( 3, '/tmp/dbitrace.log' );
 	eval {

From 315d1a32236f52b9d403af8971e866162b6f8792 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 18 Dec 2023 13:50:54 +0100
Subject: [PATCH 15/62] add autorefresh to agent view

---
 pandora_console/godmode/users/configure_user.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 83e54f24c5..6b64cff6e7 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1556,6 +1556,7 @@ if (empty($doubleAuthElementsContent) === false) {
 $autorefresh_list_out = [];
 if (is_metaconsole() === false || is_centralized() === true) {
     $autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail';
+    $autorefresh_list_out['operation/agentes/ver_agente'] = 'Agent view';
     $autorefresh_list_out['operation/agentes/alerts_status'] = 'Alert detail';
     $autorefresh_list_out['enterprise/operation/cluster/cluster'] = 'Cluster view';
     $autorefresh_list_out['operation/gis_maps/render_view'] = 'Gis Map';

From 5c047fc1b54f14d159f8e52249f0d42937b89cae Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 18 Dec 2023 14:46:44 +0100
Subject: [PATCH 16/62] #12657 entries order function datatables

---
 pandora_console/include/javascript/datatablesFunction.js | 5 +++++
 pandora_console/operation/events/events.php              | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/javascript/datatablesFunction.js b/pandora_console/include/javascript/datatablesFunction.js
index 34fe301f41..b517830ce9 100644
--- a/pandora_console/include/javascript/datatablesFunction.js
+++ b/pandora_console/include/javascript/datatablesFunction.js
@@ -66,6 +66,11 @@ if (typeof dt.pagination_options !== "undefined") {
   lengthMenu = dt.pagination_options;
 }
 
+if (dt.pagination_options_order === "true") {
+  lengthMenu[0] = lengthMenu[0].sort((a, b) => a - b);
+  lengthMenu[1] = lengthMenu[1].sort((a, b) => a - b);
+}
+
 var ordering = true;
 if (typeof dt.ordering !== "undefined" && dt.ordering === false) {
   ordering = dt.ordering;
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 4365ff6594..63ee1c468c 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -2839,7 +2839,7 @@ try {
                     'extra_html'                     => $active_filters_div.$graph_div,
                     'pagination_options'             => [
                         [
-                            $config['block_size'],
+                            (int) $config['block_size'],
                             10,
                             25,
                             100,
@@ -2847,7 +2847,7 @@ try {
                             500,
                         ],
                         [
-                            $config['block_size'],
+                            (int) $config['block_size'],
                             10,
                             25,
                             100,
@@ -2855,6 +2855,7 @@ try {
                             500,
                         ],
                     ],
+                    'pagination_options_order'       => 'true',
                     'order'                          => [
                         'field'     => 'timestamp',
                         'direction' => 'desc',

From a0ad52b75f89dd66e4971c0f5eb1f39d591cc98f Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Thu, 21 Dec 2023 13:13:31 +0100
Subject: [PATCH 17/62] #12128 action alert no show when empty

---
 pandora_console/godmode/alerts/alert_view.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php
index 7809742221..499bbded5e 100644
--- a/pandora_console/godmode/alerts/alert_view.php
+++ b/pandora_console/godmode/alerts/alert_view.php
@@ -308,13 +308,18 @@ $table->head[0] = __('Actions');
 $table->style[0] = 'font-weight: bold; text-align: left;';
 
 if (count($actions) == 1 && isset($actions[0])) {
-    $table->head[1] = __('Every time that the alert is fired');
-    $table->data[0][0] = $actions[0]['name'];
-    $table->data[0][1] = html_print_image(
-        'images/tick.png',
-        true,
-        ['class' => 'invert_filter']
-    );
+    if (!empty($actions[0]['name'])) {
+        $table->head[1] = __('Every time that the alert is fired');
+        $table->data[0][0] = $actions[0]['name'];
+        $table->data[0][1] = html_print_image(
+            'images/tick.png',
+            true,
+            ['class' => 'invert_filter']
+        );
+    } else {
+        $table->colspan[0] = 2;
+        $table->data[0] = __('No action defined.');
+    }
 } else {
     foreach ($actions as $kaction => $action) {
         $table->data[$kaction][0] = $action['name'];

From 05ec992fac45ae7d56e85e9c47b5b6f23c9379b5 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 27 Dec 2023 16:05:34 +0100
Subject: [PATCH 18/62] #12522 enhanced audit log

---
 pandora_console/extensions/dbmanager.php        | 17 ++++++++---------
 .../godmode/reporting/map_builder.php           |  6 ++++++
 .../godmode/reporting/reporting_builder.php     |  6 +++---
 .../reporting/visual_console_builder.php        |  8 ++++----
 .../include/lib/Dashboard/Manager.php           | 14 ++++++++++++++
 .../operation/reporting/reporting_viewer.php    |  7 +++++++
 6 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index acaaadd12c..38bb7c2d8b 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -280,18 +280,17 @@ function dbmgr_extension_main()
 
     if (is_array($result) === false) {
         echo '<strong>Output: <strong>'.$result;
-
-        db_pandora_audit(
-            AUDIT_LOG_SYSTEM,
-            'DB Interface Extension. SQL',
-            false,
-            false,
-            $sql
-        );
-
         return;
     }
 
+    db_pandora_audit(
+        AUDIT_LOG_SYSTEM,
+        'DB Interface Extension. SQL',
+        false,
+        false,
+        $sql
+    );
+
     echo "<div class='overflow'>";
     $table = new stdClass();
     $table->width = '100%';
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 7a8d2df32c..6dbb6a1dbf 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -250,6 +250,12 @@ if ($delete_layout || $copy_layout) {
 
         $result = db_process_sql_insert('tlayout', $values);
 
+        $auditMessage = ((bool) $result !== false) ? 'Copy visual console' : 'Fail try to copy visual console';
+        db_pandora_audit(
+            AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
+            sprintf('%s %s #%s', $auditMessage, $visualConsoleName, $id_layout)
+        );
+
         $idNewVisualConsole = $result;
 
         if ($result) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 842e05147d..777011e4c7 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -626,7 +626,7 @@ switch ($action) {
 
             db_pandora_audit(
                 AUDIT_LOG_REPORT_MANAGEMENT,
-                sprintf('%s #%s', $auditMessage, $idReport)
+                sprintf('%s %s #%s', $auditMessage, $report['name'], $idReport)
             );
 
             ui_print_result_message(
@@ -1461,7 +1461,7 @@ switch ($action) {
                         $auditMessage = ($resultOperationDB === true) ? 'Update report' : 'Fail try to update report';
                         db_pandora_audit(
                             AUDIT_LOG_REPORT_MANAGEMENT,
-                            sprintf('%s #%s', $auditMessage, $idReport)
+                            sprintf('%s %s #%s', $auditMessage, $new_values['name'], $idReport),
                         );
                     } else {
                         $resultOperationDB = false;
@@ -1513,7 +1513,7 @@ switch ($action) {
                             ]
                         );
 
-                        $auditMessage = ((bool) $idOrResult === true) ? sprintf('Create report #%s', $idOrResult) : 'Fail try to create report';
+                        $auditMessage = ((bool) $idOrResult === true) ? sprintf('Create report %s #%s', $reportName, $idOrResult) : 'Fail try to create report';
                         db_pandora_audit(
                             AUDIT_LOG_REPORT_MANAGEMENT,
                             $auditMessage
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 7c04892524..c49acaf80d 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -300,7 +300,7 @@ switch ($activeTab) {
                             ui_update_name_fav_element($idVisualConsole, 'Visual_Console', $values['name']);
                             db_pandora_audit(
                                 AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
-                                sprintf('Update visual console #%s', $idVisualConsole)
+                                sprintf('Update visual console %s #%s', io_safe_output($values['name']), $idVisualConsole)
                             );
                             $action = 'edit';
                             $statusProcessInDB = [
@@ -320,7 +320,7 @@ switch ($activeTab) {
                         } else {
                             db_pandora_audit(
                                 AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
-                                sprintf('Fail update visual console #%s', $idVisualConsole)
+                                sprintf('Fail update visual console %s #%s', $values['name'], $idVisualConsole)
                             );
                             $statusProcessInDB = [
                                 'flag'    => false,
@@ -339,7 +339,7 @@ switch ($activeTab) {
                         if ($idVisualConsole !== false) {
                             db_pandora_audit(
                                 AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
-                                sprintf('Create visual console #%s', $idVisualConsole)
+                                sprintf('Create visual console %s #%s', io_safe_output($values['name']), $idVisualConsole)
                             );
                             $action = 'edit';
                             $statusProcessInDB = [
@@ -359,7 +359,7 @@ switch ($activeTab) {
                         } else {
                             db_pandora_audit(
                                 AUDIT_LOG_VISUAL_CONSOLE_MANAGEMENT,
-                                'Fail try to create visual console'
+                                sprintf('Fail try to create visual console %s #%s', io_safe_output($values['name']), $idVisualConsole)
                             );
                             $statusProcessInDB = [
                                 'flag'    => false,
diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php
index 720045dccc..7e5562ebef 100644
--- a/pandora_console/include/lib/Dashboard/Manager.php
+++ b/pandora_console/include/lib/Dashboard/Manager.php
@@ -564,6 +564,13 @@ class Manager implements PublicLogin
             ];
         }
 
+        $auditMessage = ($res === false) ? sprintf('Fail try update dashboard %s #%s', $values['name'], $this->dashboardId) : sprintf('Dashboard update %s #%s', $values['name'], $this->dashboardId);
+        db_pandora_audit(
+            AUDIT_LOG_DASHBOARD_MANAGEMENT,
+            $auditMessage,
+            false,
+        );
+
         return $result;
     }
 
@@ -744,6 +751,13 @@ class Manager implements PublicLogin
             }
         }
 
+        $auditMessage = ($result === false) ? sprintf('Fail try copy dashboard %s #%s', $values['name'], $this->dashboardId) : sprintf('Copy dashboard %s #%s', $values['name'], $this->dashboardId);
+        db_pandora_audit(
+            AUDIT_LOG_DASHBOARD_MANAGEMENT,
+            $auditMessage,
+            false,
+        );
+
         return $result;
     }
 
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 4bc5a05b61..fdd950575c 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -428,6 +428,13 @@ echo '</div>';
 ui_include_time_picker();
 ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
 
+db_pandora_audit(
+    AUDIT_LOG_REPORT_MANAGEMENT,
+    sprintf('Report visualized %s #%s.', $report['name'], $report['id_report']),
+    false,
+    false
+);
+
 ?>
 <script language="javascript" type="text/javascript">
 

From 110d7f48421976c261bd894e3a975f52fa62fac2 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 2 Jan 2024 12:57:02 +0100
Subject: [PATCH 19/62] #12323 added netflow interval select

---
 pandora_console/godmode/setup/setup_netflow.php | 17 +++++++++++++++++
 pandora_console/include/functions_config.php    |  8 ++++++++
 pandora_console/pandoradb_data.sql              |  2 +-
 pandora_server/lib/PandoraFMS/Config.pm         |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php
index 9e6f6ee180..07db7327a5 100644
--- a/pandora_console/godmode/setup/setup_netflow.php
+++ b/pandora_console/godmode/setup/setup_netflow.php
@@ -83,6 +83,23 @@ $table->data[3][] = html_print_label_input_block(
     html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true)
 );
 
+$table->data[4][] = html_print_label_input_block(
+    __('Netflow interval').ui_print_help_tip(__('It is necessary to restart the server if the value is changed.'), true),
+    html_print_select(
+        [
+            '600'  => __('10 min'),
+            '1800' => __('30 min'),
+            '3600' => __('60 min'),
+        ],
+        'netflow_interval',
+        $config['netflow_interval'],
+        '',
+        '',
+        0,
+        true
+    )
+);
+
 $table->data[4][] = html_print_label_input_block(
     __('Enable Sflow'),
     html_print_checkbox_switch_extended(
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9eb19be28d..dc7bb103db 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1624,6 +1624,10 @@ function config_update_config()
                         $error_update[] = __('Netflow max lifetime');
                     }
 
+                    if (config_update_value('netflow_interval', (int) get_parameter('netflow_interval'), true) === false) {
+                        $error_update[] = __('Netflow interval');
+                    }
+
                     if (config_update_value('netflow_get_ip_hostname', (int) get_parameter('netflow_get_ip_hostname'), true) === false) {
                         $error_update[] = __('Name resolution for IP address');
                     }
@@ -3060,6 +3064,10 @@ function config_process_config()
         config_update_value('netflow_max_lifetime', '5');
     }
 
+    if (!isset($config['netflow_interval'])) {
+        config_update_value('netflow_interval', 1800);
+    }
+
     if (!isset($config['sflow_interval'])) {
         config_update_value('sflow_interval', SECONDS_10MINUTES);
     }
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index a7df8d9764..25818b1f3e 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -91,7 +91,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('sound_alert', 'include/sounds/air_shock_alarm.wav'),
 ('sound_critical', 'include/sounds/Star_Trek_emergency_simulation.wav'),
 ('sound_warning', 'include/sounds/negativebeep.wav'),
-('netflow_interval', '3600'),
+('netflow_interval', '1800'),
 ('netflow_daemon', '/usr/bin/nfcapd'),
 ('netflow_nfdump', '/usr/bin/nfdump'),
 ('netflow_max_resolution', '50'),
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 87c32de026..ee98db9627 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -140,7 +140,7 @@ sub pandora_get_sharedconfig ($$) {
 	# Netflow configuration options
 	$pa_config->{"activate_netflow"} = pandora_get_tconfig_token ($dbh, 'activate_netflow', 0);
 	$pa_config->{"netflow_path"} = pandora_get_tconfig_token ($dbh, 'netflow_path', '/var/spool/pandora/data_in/netflow');
-	$pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 3600);
+	$pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 1800);
 	$pa_config->{"netflow_daemon"} = pandora_get_tconfig_token ($dbh, 'netflow_daemon', '/usr/bin/nfcapd');
 
 	# Sflow configuration options

From 981ae0977dbfc3586a0f2cc3809832bee0c4c6a3 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 8 Jan 2024 12:36:08 +0100
Subject: [PATCH 20/62] fix visual error um-offline pandora_enterprise#12399

---
 .../resources/images/info-warning.svg                 | 11 +++++++++++
 .../update_manager_client/resources/styles/um.css     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pandora_console/update_manager_client/resources/images/info-warning.svg

diff --git a/pandora_console/update_manager_client/resources/images/info-warning.svg b/pandora_console/update_manager_client/resources/images/info-warning.svg
new file mode 100644
index 0000000000..f707aa9410
--- /dev/null
+++ b/pandora_console/update_manager_client/resources/images/info-warning.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 14 / info@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-14-/-info" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icons/Elements/Help-mini" fill="#f3b200">
+            <path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M7,6 C6.44771525,6 6,6.44771525 6,7 L6,7 L6,10 C6,10.5522847 6.44771525,11 7,11 C7.55228475,11 8,10.5522847 8,10 L8,10 L8,7 C8,6.44771525 7.55228475,6 7,6 Z M7,3 C6.44771525,3 6,3.44771525 6,4 C6,4.55228475 6.44771525,5 7,5 C7.55228475,5 8,4.55228475 8,4 C8,3.44771525 7.55228475,3 7,3 Z" id="Elements-/-Help-mini"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/update_manager_client/resources/styles/um.css b/pandora_console/update_manager_client/resources/styles/um.css
index fe28eaa176..439e33c957 100644
--- a/pandora_console/update_manager_client/resources/styles/um.css
+++ b/pandora_console/update_manager_client/resources/styles/um.css
@@ -441,7 +441,7 @@ div#upload span.browse {
 span.warning {
   min-width: 10em;
   min-height: 10em;
-  background: url(../images/icono_warning.png);
+  background: url(../images/info-warning.svg);
   background-repeat: no-repeat;
   background-position: center;
   background-size: 80%;

From 9a7ef16f9cabf17def8db87cf3adcc7dbd029740 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 8 Jan 2024 17:31:52 +0100
Subject: [PATCH 21/62] implement several changes in top-n connection report
 item

---
 .../reporting_builder.item_editor.php         |  83 ++++++++-
 .../godmode/reporting/reporting_builder.php   |  13 ++
 pandora_console/include/functions_netflow.php | 170 ++++++++++++++----
 .../include/functions_reporting.php           |  23 ++-
 pandora_console/include/styles/pandora.css    |   4 +
 5 files changed, 253 insertions(+), 40 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 7199c5e15b..49a8419aa6 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1042,7 +1042,11 @@ switch ($action) {
                     $resolution = $item['top_n'];
                     // Interval resolution.
                     $max_values = $item['top_n_value'];
-                    // Max values.
+                    $es = json_decode($item['external_source'], true);
+                    $top_n_type = $es['top_n_type'];
+                    $display_graph = $es['display_graph'];
+                    $display_summary = $es['display_summary'];
+                    $display_data_table = $es['display_data_table'];
                 break;
 
                 case 'permissions_report':
@@ -1687,6 +1691,75 @@ if (is_metaconsole() === true) {
             </td>
         </tr>
 
+        <tr id="row_top_n_type"   class="datos">
+            <td class="bolder"><?php echo __('Type'); ?></td>
+            <td  >
+                <?php
+                $types = [
+                    0 => __('Show aggregate by destination port'),
+                    1 => __('Show InBound/Outbound traffic per SrcIP/DestIP'),
+                ];
+                html_print_select(
+                    $types,
+                    'top_n_type',
+                    $top_n_type,
+                    ''
+                );
+                ?>
+            </td>
+        </tr>
+
+        <tr id="row_display_graph" class="datos">
+            <td class="bolder">
+                <?php
+                echo __('Display graph');
+                ?>
+            </td>
+            <td  >
+                <?php
+                html_print_checkbox_switch(
+                    'display_graph',
+                    1,
+                    ($display_graph ?? true)
+                );
+                ?>
+            </td>
+        </tr>
+
+        <tr id="row_display_summary_table" class="datos">
+            <td class="bolder">
+                <?php
+                echo __('Display summary table');
+                ?>
+            </td>
+            <td  >
+                <?php
+                html_print_checkbox_switch(
+                    'display_summary',
+                    1,
+                    ($display_summary ?? true)
+                );
+                ?>
+            </td>
+        </tr>
+
+        <tr id="row_display_data_table" class="datos">
+            <td class="bolder">
+                <?php
+                echo __('Display data table');
+                ?>
+            </td>
+            <td  >
+                <?php
+                html_print_checkbox_switch(
+                    'display_data_table',
+                    1,
+                    ($display_data_table ?? true)
+                );
+                ?>
+            </td>
+        </tr>
+
         <tr id="row_period_service_level"   class="datos">
             <td class="bolder">
                 <?php
@@ -7283,6 +7356,10 @@ function chooseType() {
     $("#row_alert_templates").hide();
     $("#row_alert_actions").hide();
     $("#row_servers").hide();
+    $("#row_top_n_type").hide();
+    $("#row_display_graph").hide();
+    $("#row_display_summary_table").hide();
+    $("#row_display_data_table").hide();
     $("#row_servers_all_opt").hide();
     $("#row_servers_all").hide();
     $("#row_multiple_servers").hide();
@@ -8219,6 +8296,10 @@ function chooseType() {
             $("#row_max_values").show();
             $("#row_resolution").show();
             $("#row_servers").show();
+            $("#row_top_n_type").show();
+            $("#row_display_graph").show();
+            $("#row_display_summary_table").show();
+            $("#row_display_data_table").show();
             $("#row_historical_db_check").hide();
             break;
 
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 7d75b5bd27..4e071892e0 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1874,6 +1874,13 @@ switch ($action) {
                                 $values['top_n_value'] = get_parameter(
                                     'max_values'
                                 );
+
+                                $es['top_n_type'] = get_parameter('top_n_type', '');
+                                $es['display_graph'] = get_parameter('display_graph', '');
+                                $es['display_summary'] = get_parameter('display_summary', '');
+                                $es['display_data_table'] = get_parameter('display_data_table', '');
+                                $values['external_source'] = json_encode($es);
+
                                 $good_format = true;
                             break;
 
@@ -2949,6 +2956,12 @@ switch ($action) {
                                 $values['top_n_value'] = get_parameter(
                                     'max_values'
                                 );
+
+                                $es['top_n_type'] = get_parameter('top_n_type', '');
+                                $es['display_graph'] = get_parameter('display_graph', '');
+                                $es['display_summary'] = get_parameter('display_summary', '');
+                                $es['display_data_table'] = get_parameter('display_data_table', '');
+                                $values['external_source'] = json_encode($es);
                                 $good_format = true;
                             break;
 
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index bc8495969f..c4d6b4dfe0 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -328,12 +328,13 @@ function netflow_data_table($data, $start_date, $end_date, $aggregate, $pdf=fals
 /**
  * Show a table with netflow top N data.
  *
- * @param array   $data        Netflow data.
- * @param integer $total_bytes Total bytes count to calculate percent data.
+ * @param array   $data          Netflow data.
+ * @param integer $total_bytes   Total bytes count to calculate percent data.
+ * @param boolean $show_extended Display extended table.
  *
  * @return string HTML data table.
  */
-function netflow_top_n_table(array $data, int $total_bytes)
+function netflow_top_n_table(array $data, int $total_bytes, bool $show_extended=false)
 {
     global $nfdump_date_format;
 
@@ -344,31 +345,42 @@ function netflow_top_n_table(array $data, int $total_bytes)
     $table->data = [];
 
     $table->head = [];
-    $table->head[0] = '<b>'.__('Source IP').'</b>';
-    $table->head[1] = '<b>'.__('Destination IP').'</b>';
-    $table->head[2] = '<b>'.__('Bytes').'</b>';
-    $table->head[3] = '<b>'.__('% Traffic').'</b>';
-    $table->head[4] = '<b>'.__('Avg. Throughput').'</b>';
-    $table->style[0] = 'padding: 4px';
+    if ($show_extended === false) {
+        $table->head[0] = '<b>'.__('Source IP').'</b>';
+        $table->head[1] = '<b>'.__('Destination IP').'</b>';
+        $table->head[2] = '<b>'.__('Bytes').'</b>';
+        $table->head[3] = '<b>'.__('% Traffic').'</b>';
+        $table->head[4] = '<b>'.__('Avg. Throughput').'</b>';
+        $table->style[0] = 'padding: 4px';
+    } else {
+        $table->head[0] = '<b>'.__('Source IP').'</b>';
+        $table->head[1] = '<b>'.__('Destination IP').'</b>';
+        $table->head[2] = '<b>'.__('Ingress bytes').'</b>';
+        $table->head[3] = '<b>'.__('Egress bytes').'</b>';
+        $table->head[4] = '<b>'.__('Ingress packets').'</b>';
+        $table->head[5] = '<b>'.__('Egress packets').'</b>';
+        $table->head[6] = '<b>'.__('% Traffic').'</b>';
+        $table->head[7] = '<b>'.__('Avg. Throughput').'</b>';
+        $table->style[0] = 'padding: 4px';
+    }
 
     $i = 0;
 
     foreach ($data as $value) {
         $table->data[$i][0] = $value['ip_src'];
         $table->data[$i][1] = $value['ip_dst'];
-        $table->data[$i][2] = network_format_bytes($value['bytes']);
 
-        $traffic = '-';
-
-        if ($total_bytes > 0) {
-            $traffic = sprintf(
-                '%.2f',
-                (($value['bytes'] / $total_bytes) * 100)
-            );
+        if ($show_extended === true) {
+            $table->data[$i][2] = network_format_bytes($value['ibytes']);
+            $table->data[$i][3] = network_format_bytes($value['obytes']);
+            $table->data[$i][4] = network_format_bytes($value['ipackages']);
+            $table->data[$i][5] = network_format_bytes($value['opackages']);
+            $table->data[$i][6] = $value['traffic'].' %';
+        } else {
+            $table->data[$i][2] = network_format_bytes($value['bytes']);
+            $table->data[$i][3] = $value['traffic'].' %';
         }
 
-        $table->data[$i][3] = $traffic.' %';
-
         $units = [
             'bps',
             'Kbps',
@@ -382,7 +394,11 @@ function netflow_top_n_table(array $data, int $total_bytes)
 
         $value['bps'] /= pow(1024, $pow);
 
-        $table->data[$i][4] = round($value['bps'], 2).' '.$units[$pow];
+        if ($show_extended === true) {
+            $table->data[$i][7] = round($value['bps'], 2).' '.$units[$pow];
+        } else {
+            $table->data[$i][4] = round($value['bps'], 2).' '.$units[$pow];
+        }
 
         $i++;
     }
@@ -481,7 +497,9 @@ function netflow_get_top_N(
     string $end_date,
     array $filter,
     int $max,
-    string $connection_name=''
+    string $connection_name='',
+    bool $extended_info=false,
+    int $total_bytes=0
 ) {
     global $nfdump_date_format;
 
@@ -496,7 +514,8 @@ function netflow_get_top_N(
         return json_decode($data, true);
     }
 
-    $options = '-o "fmt:%sap,%dap,%ibyt,%bps" -q -n '.$max.' -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date);
+    $opts = ($extended_info === true) ? 'fmt:%sap,%dap,%ibyt,%obyt,%ipkt,%opkt,%bps' : 'fmt:%sap,%dap,%ibyt,%ipkt,%bps';
+    $options = '-o "'.$opts.'" -q -n '.$max.' -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date);
 
     $command = netflow_get_command($options, $filter, $start_date, $end_date);
 
@@ -516,8 +535,29 @@ function netflow_get_top_N(
 
         $values[$i]['ip_src'] = $parsed_line[0];
         $values[$i]['ip_dst'] = $parsed_line[1];
-        $values[$i]['bytes'] = $parsed_line[2];
-        $values[$i]['bps'] = $parsed_line[3];
+
+        $traffic = '-';
+        if ($total_bytes > 0) {
+            $conn_bytes = $parsed_line[2];
+
+            $traffic = sprintf(
+                '%.2f',
+                (($conn_bytes / $total_bytes) * 100)
+            );
+        }
+
+        $values[$i]['traffic'] = $traffic;
+
+        if ($extended_info === true) {
+            $values[$i]['ibytes'] = $parsed_line[2];
+            $values[$i]['obytes'] = $parsed_line[3];
+            $values[$i]['ipackets'] = $parsed_line[4];
+            $values[$i]['opackets'] = $parsed_line[5];
+            $values[$i]['bps'] = $parsed_line[6];
+        } else {
+            $values[$i]['bytes'] = $parsed_line[2];
+            $values[$i]['bps'] = $parsed_line[3];
+        }
 
         $i++;
     }
@@ -1341,7 +1381,11 @@ function netflow_draw_item(
     $output='HTML',
     $address_resolution=false,
     $width_content=false,
-    $height_content=false
+    $height_content=false,
+    $extended=false,
+    $show_graph=true,
+    $show_summary=true,
+    $show_table=true
 ) {
     $aggregate = $filter['aggregate'];
     $interval = ($end_date - $start_date);
@@ -1496,7 +1540,9 @@ function netflow_draw_item(
                 $end_date,
                 $filter,
                 $max_aggregates,
-                $connection_name
+                $connection_name,
+                $extended,
+                $data_summary['totalbytes']
             );
 
             if (empty($data_top_n) === true) {
@@ -1505,16 +1551,61 @@ function netflow_draw_item(
 
             if ($output === 'HTML' || $output === 'PDF') {
                 $html = '<table class="w100p">';
-                $html .= '<tr>';
-                $html .= "<td class='w50p'>";
-                $html .= netflow_summary_table($data_summary);
-                $html .= '</td>';
-                $html .= '</tr>';
-                $html .= '<tr>';
-                $html .= "<td class='w100p'>";
-                $html .= netflow_top_n_table($data_top_n, $data_summary['totalbytes']);
-                $html .= '</td>';
-                $html .= '</tr>';
+
+                if ($show_graph === true && $max_aggregates <= 10) {
+                    $labels = array_map(
+                        function ($conn) {
+                            return __('% Traffic').' '.$conn['ip_src'].' - '.$conn['ip_dst'];
+                        },
+                        $data_top_n
+                    );
+
+                    $pie_data = array_map(
+                        function ($conn) {
+                            return $conn['traffic'];
+                        },
+                        $data_top_n
+                    );
+
+                    $graph_output = pie_graph(
+                        $pie_data,
+                        [
+                            'legend' => [
+                                'display'  => true,
+                                'position' => 'right',
+                                'align'    => 'center',
+                            ],
+                            'labels' => $labels,
+                        ]
+                    );
+
+                    $html .= '<tr>';
+                    $html .= "<td class='w500p padding-bottom-25px'>";
+                    $html .= $graph_output;
+                    $html .= '</td>';
+                    $html .= '</tr>';
+                }
+
+                if ($show_summary === true) {
+                    $html .= '<tr>';
+                    $html .= "<td class='w50p'>";
+                    $html .= netflow_summary_table($data_summary);
+                    $html .= '</td>';
+                    $html .= '</tr>';
+                }
+
+                if ($show_table === true) {
+                    $html .= '<tr>';
+                    $html .= "<td class='w100p'>";
+                    $html .= netflow_top_n_table(
+                        $data_top_n,
+                        $data_summary['totalbytes'],
+                        $extended
+                    );
+                    $html .= '</td>';
+                    $html .= '</tr>';
+                }
+
                 $html .= '</table>';
 
                 return $html;
@@ -1638,7 +1729,8 @@ function netflow_get_item_data(
     string $type_netflow,
     array $filter,
     int $max_aggregates,
-    string $connection_name
+    string $connection_name,
+    bool $extended=false
 ) {
     $data = [];
 
@@ -1656,7 +1748,9 @@ function netflow_get_item_data(
                 $end_date,
                 $filter,
                 $max_aggregates,
-                $connection_name
+                $connection_name,
+                $extended,
+                $data_summary['totalbytes']
             );
 
             $data = [
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index bccada9cb8..2b8a0f01ef 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -6981,6 +6981,20 @@ function reporting_netflow(
         $filter['aggregate'] = 'dstport';
     }
 
+    $es = json_decode($content['external_source'], true);
+
+    $extended = false;
+    $show_graph = false;
+    $show_summary = false;
+    $show_table = false;
+
+    if (empty($es) === false) {
+        $extended = ((int) $es['top_n_type'] === 1);
+        $show_graph = ((int) $es['display_graph'] === 1);
+        $show_summary = ((int) $es['display_summary'] === 1);
+        $show_table = ((int) $es['display_data_table'] === 1);
+    }
+
     switch ($type) {
         case 'dinamic':
         case 'static':
@@ -6992,7 +7006,14 @@ function reporting_netflow(
                 $filter,
                 $content['top_n_value'],
                 $content['server_name'],
-                (($pdf === true) ? 'PDF' : 'HTML')
+                (($pdf === true) ? 'PDF' : 'HTML'),
+                false,
+                false,
+                false,
+                $extended,
+                $show_graph,
+                $show_summary,
+                $show_table
             );
         break;
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 71118e529a..835c964758 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1017,6 +1017,10 @@ select:-internal-list-box {
   padding-bottom: 5px;
 }
 
+.padding-bottom-25px {
+  padding-bottom: 25px;
+}
+
 .padding-right-2 {
   padding-right: 2em;
 }

From f6ee798603d5e4d939a6f6f1555c3dd8f06d1084 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 8 Jan 2024 17:59:23 +0100
Subject: [PATCH 22/62] implement several changes in top-n connection report
 item

---
 pandora_console/include/functions_netflow.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index c4d6b4dfe0..51b74c59b0 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -349,8 +349,9 @@ function netflow_top_n_table(array $data, int $total_bytes, bool $show_extended=
         $table->head[0] = '<b>'.__('Source IP').'</b>';
         $table->head[1] = '<b>'.__('Destination IP').'</b>';
         $table->head[2] = '<b>'.__('Bytes').'</b>';
-        $table->head[3] = '<b>'.__('% Traffic').'</b>';
-        $table->head[4] = '<b>'.__('Avg. Throughput').'</b>';
+        $table->head[3] = '<b>'.__('Packets').'</b>';
+        $table->head[4] = '<b>'.__('% Traffic').'</b>';
+        $table->head[5] = '<b>'.__('Avg. Throughput').'</b>';
         $table->style[0] = 'padding: 4px';
     } else {
         $table->head[0] = '<b>'.__('Source IP').'</b>';
@@ -378,7 +379,8 @@ function netflow_top_n_table(array $data, int $total_bytes, bool $show_extended=
             $table->data[$i][6] = $value['traffic'].' %';
         } else {
             $table->data[$i][2] = network_format_bytes($value['bytes']);
-            $table->data[$i][3] = $value['traffic'].' %';
+            $table->data[$i][3] = network_format_bytes($value['ipackages']);
+            $table->data[$i][4] = $value['traffic'].' %';
         }
 
         $units = [
@@ -397,7 +399,7 @@ function netflow_top_n_table(array $data, int $total_bytes, bool $show_extended=
         if ($show_extended === true) {
             $table->data[$i][7] = round($value['bps'], 2).' '.$units[$pow];
         } else {
-            $table->data[$i][4] = round($value['bps'], 2).' '.$units[$pow];
+            $table->data[$i][5] = round($value['bps'], 2).' '.$units[$pow];
         }
 
         $i++;

From 19024e63d304a6d854e1f8f05e324813a813f450 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 8 Jan 2024 18:05:29 +0100
Subject: [PATCH 23/62] implement several changes in top-n connection report
 item

---
 pandora_console/include/functions_netflow.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index 51b74c59b0..770314f507 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -374,12 +374,12 @@ function netflow_top_n_table(array $data, int $total_bytes, bool $show_extended=
         if ($show_extended === true) {
             $table->data[$i][2] = network_format_bytes($value['ibytes']);
             $table->data[$i][3] = network_format_bytes($value['obytes']);
-            $table->data[$i][4] = network_format_bytes($value['ipackages']);
-            $table->data[$i][5] = network_format_bytes($value['opackages']);
+            $table->data[$i][4] = (empty($value['ipackages']) === true) ? 0 : $value['ipackages'];
+            $table->data[$i][5] = (empty($value['opackages']) === true) ? 0 : $value['opackages'];
             $table->data[$i][6] = $value['traffic'].' %';
         } else {
             $table->data[$i][2] = network_format_bytes($value['bytes']);
-            $table->data[$i][3] = network_format_bytes($value['ipackages']);
+            $table->data[$i][3] = (empty($value['ipackages']) === true) ? 0 : $value['ipackages'];
             $table->data[$i][4] = $value['traffic'].' %';
         }
 

From 600797d531a2ba9e51db042f17a8fc3055c933fe Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Mon, 8 Jan 2024 14:50:11 -0600
Subject: [PATCH 24/62] Previous installation verification

---
 pandora_server/pandora_server_installer | 31 ++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index ca831fb1e5..f77a2c294d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -191,7 +191,36 @@ install () {
 		esac
 		shift
 	done
-	
+
+	# Alternative destdir has been selected	
+	if [ ! -z "$DESTDIR" ]
+	then
+		# Files from previous installation were found
+		if [ -d "/usr/lib/perl5/PandoraFMS" ] 
+		then
+			GREEN='\033[01;32m'
+			NONE='\033[0m'
+			
+			echo -e -n "Files from a previous installation were found in ${GREEN}/usr/lib/perl5/PandoraFMS/${NONE}. " 	
+			read -p "That directory will be deleted in order to preserve integrity. Do you wish to proceed? (y/N): " USERAPPROVAL
+
+			if [ "${USERAPPROVAL,,}" = "y" ]; then
+				rm -rf "/usr/lib/perl5/PandoraFMS"
+				echo -e "Previous PandoraFMS directory deleted successfully"
+			else
+				echo -e -n "Files in ${GREEN}/usr/lib/perl5/PandoraFMS/${NONE} will not be deleted. This may cause issues. " 	
+				read -p "Do you want to proceed with the installation anyway? (y/N): " USERAPPROVAL
+
+				if [ "${USERAPPROVAL,,}" = "y" ]; then
+					echo "Proceeding with the installation anyway. This may cause problems in the future due to the existence of files from previous installations."
+				else
+					echo "Installation aborted. You chose not to proceed."
+					exit 1
+				fi
+			fi
+		fi
+	fi
+
 	if [ "$LINUX" = YES ]
 	then
 		echo "$DISTRO distribution detected"

From 5cf9d70c6f57ccc00ef383e5b36a00de3be7d2cd Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Thu, 11 Jan 2024 09:58:06 -0600
Subject: [PATCH 25/62] Add config token for mail_subject_encoding

---
 pandora_server/conf/pandora_server.conf.new | 2 ++
 pandora_server/lib/PandoraFMS/Config.pm     | 5 +++++
 pandora_server/lib/PandoraFMS/Tools.pm      | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index bddb11a293..1945cbd08f 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -816,3 +816,5 @@ madeserver_autofit 7d
 # Model sensitivity. A lower value triggers less anomalies (PANDORA FMS ENTERPRISE ONLY).
 madeserver_sensitivity 0.1
 
+# Encoding to use on mail subject (MIME-Header by default)
+# mail_subject_encoding MIME-Header-ISO_2022_JP
\ No newline at end of file
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4f45c28b19..4b7a6c142a 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -589,6 +589,8 @@ sub pandora_load_config {
 
 	$pa_config->{"madeserver"} = 0; # 774.
 
+	$pa_config->{"mail_subject_encoding"} = 'MIME-Header'; # 776.
+
 	# Check for UID0
 	if ($pa_config->{"quiet"} != 0){
 		if ($> == 0){
@@ -691,6 +693,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^mail_in_separate\s+([0-9]*)/i) { 
 			$pa_config->{'mail_in_separate'}= clean_blank($1); 
 		}
+		elsif ($parametro =~ m/^mail_subject_encoding\s(.*)/i) { 
+			$pa_config->{'mail_subject_encoding'}= clean_blank($1); 
+		}
 		elsif ($parametro =~ m/^snmp_logfile\s(.*)/i) { 
 			$pa_config->{'snmp_logfile'}= clean_blank($1); 
 		}
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 580344542c..543ea45556 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -748,6 +748,7 @@ sub pandora_sendmail {
 	my $subject = $_[2];
 	my $message = $_[3];
 	my $content_type = $_[4];
+	my $encoding = $pa_config->{"mail_subject_encoding"} || 'MIME-Header';
 	
 	$subject = decode_entities ($subject);
 
@@ -758,7 +759,7 @@ sub pandora_sendmail {
 	
 	my %mail = ( To	=> $to_address,
 		Message		=> $message,
-		Subject		=> encode('MIME-Header', $subject),
+		Subject		=> encode($encoding, $subject),
 		'X-Mailer'	=> $pa_config->{"rb_product_name"},
 		Smtp		=> $pa_config->{"mta_address"},
 		Port		=> $pa_config->{"mta_port"},

From c8a73f59f5026e5ab89f10296e2961108e64fce0 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 16 Jan 2024 11:53:11 +0100
Subject: [PATCH 26/62] #12569 added audit in discovery and task console

---
 pandora_console/include/constants.php            | 1 +
 pandora_console/include/functions_cron_task.php  | 8 ++++++++
 pandora_server/lib/PandoraFMS/DiscoveryServer.pm | 1 +
 3 files changed, 10 insertions(+)

diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index b2ce8d88b4..d68bba9c22 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -819,6 +819,7 @@ define('AUDIT_LOG_INCIDENT_MANAGEMENT', 'Incident management');
 define('AUDIT_LOG_UMC', 'Warp Manager');
 define('AUDIT_LOG_NMS_VIOLATION', 'NMS Violation');
 define('AUDIT_LOG_ENTERPRISE_VIOLATION', 'Enterprise Violation');
+define('AUDIT_LOG_CRON_TASK', 'Cron task');
 
 // MIMEs.
 define(
diff --git a/pandora_console/include/functions_cron_task.php b/pandora_console/include/functions_cron_task.php
index 40a6e159cc..c00fd441d8 100644
--- a/pandora_console/include/functions_cron_task.php
+++ b/pandora_console/include/functions_cron_task.php
@@ -419,6 +419,14 @@ function cron_task_run(
 			WHERE id=".$id_user_task;
     }
 
+    db_pandora_audit(
+        AUDIT_LOG_CRON_TASK,
+        'Executed cron task: '.$task['name'].' #'.$task['id'],
+        false,
+        false,
+        ''
+    );
+
     db_process_sql($sql);
     db_process_sql($sql2);
 }
diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index 6c2927f2a6..2df6dd31d0 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -524,6 +524,7 @@ sub exec_recon_app ($$$) {
 		logger($pa_config, 'Invalid summary for recon app ID ' . $task->{'id_app'}, 10);
 	} else {
 		db_do($dbh, "UPDATE trecon_task SET summary=? WHERE id_rt=?", $summary_json, $task->{'id_rt'});
+	  pandora_audit ($pa_config, 'Discovery task' . ' Executed task '.$task->{'name'}.'#'.$task->{'id_app'}, 'SYSTEM', 'Discovery task', $dbh);
 	}
 
 	update_recon_task($dbh, $task->{'id_rt'}, $status);

From d3ca5862b41a17bb09c1acfec48e12887ffead36 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Wed, 17 Jan 2024 11:01:25 +0100
Subject: [PATCH 27/62] #12222 Fix timezone offset when modules has timezone
 data

---
 pandora_server/lib/PandoraFMS/DataServer.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 80e8bb4bd3..7dfee63af3 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -627,6 +627,11 @@ sub process_xml_data ($$$$$) {
 
 		my $module_type = get_tag_value ($module_data, 'type', 'generic_data');
 
+		# Apply timezone offset to module if timestamp is set.
+		if (defined($module_data->{'timestamp'} && $module_data->{'timestamp'} ne '')) {
+			$module_data->{'timestamp'} = strftime ("%Y-%m-%d %H:%M:%S", localtime($module_data->{'timestamp'} + ($timezone_offset * 3600)));
+		}
+
 		# Single data
 		if (! defined ($module_data->{'datalist'})) {
 			my $data_timestamp = get_tag_value ($module_data, 'timestamp', $timestamp);

From 6e820ab58c2cb759aeaca68259aab6b10912ddcd Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Wed, 17 Jan 2024 12:07:33 +0100
Subject: [PATCH 28/62] #12364 Added filter css

---
 pandora_console/include/styles/pandora.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 94d337bdbe..ce3d14c10a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -767,6 +767,10 @@ select:-internal-list-box {
   width: 80%;
 }
 
+.w85p {
+  width: 85%;
+}
+
 .w88p {
   width: 88%;
 }

From 0efe0041227b49766b1ba4da0d47397d8110b303 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Wed, 17 Jan 2024 13:29:21 +0100
Subject: [PATCH 29/62] #12767 Fixed password

---
 pandora_console/include/styles/pandora.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 94d337bdbe..7c188058f3 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -12076,6 +12076,10 @@ div.relative > div > div#ui-datepicker-div {
   width: 400px;
 }
 
+.container-div-input-password {
+  display: inline !important;
+}
+
 #message_dialog_connection {
   height: auto !important;
 }

From 0ceb5787170bf28d951d7b161ccb966d1353bdb5 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 17 Jan 2024 16:48:38 +0100
Subject: [PATCH 30/62] #12522 fixed audit log in setup

---
 pandora_console/include/functions_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9eb19be28d..9f4c38aa68 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -117,7 +117,7 @@ function config_update_value($token, $value, $noticed=false, $password=false)
         return true;
     } else {
         // Something in setup changes.
-        if ($noticed === false) {
+        if ($noticed === true) {
             db_pandora_audit(
                 AUDIT_LOG_SETUP,
                 'Setup has changed',

From ae3c9bc2f52fbe496a5c2ebf98fe0904f49af7ed Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Thu, 18 Jan 2024 10:28:57 +0100
Subject: [PATCH 31/62] #12754 Fixed status

---
 pandora_console/include/ajax/module.php       | 29 ++++++++++++++-----
 .../lib/Dashboard/Widgets/ModulesByStatus.php | 14 ++++++++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index bddf72a217..2a9580a000 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1900,12 +1900,24 @@ if (check_login()) {
                 unset($expl[$exist]);
             }
 
-            array_push($expl, '1', '2');
+            array_push($expl, '1', '2', '3', '4', '5');
 
             $status = implode(',', $expl);
         }
 
-        if (empty($status) === false) {
+        if (str_contains($status, '5') === true) {
+            $expl = explode(',', $status);
+            $exist = array_search('5', $expl);
+            if (isset($exist) === true) {
+                unset($expl[$exist]);
+            }
+
+            array_push($expl, '4', '5');
+
+            $status = implode(',', $expl);
+        }
+
+        if (empty($status) === false || $status === '0') {
             $where .= sprintf(
                 ' AND tagente_estado.estado IN (%s)
                 AND tagente_modulo.delete_pending = 0',
@@ -2148,24 +2160,25 @@ if (check_login()) {
             );
 
             switch ((int) $row['estado']) {
-                case 0:
+                case AGENT_MODULE_STATUS_NORMAL:
                     $status_img = ui_print_status_image(STATUS_MODULE_OK, __('Normal'), true);
                 break;
 
-                case 1:
-                case 6:
+                case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                case AGENT_MODULE_STATUS_NOT_NORMAL:
                     $status_img = ui_print_status_image(STATUS_MODULE_CRITICAL, __('Critical'), true);
                 break;
 
-                case 2:
+                case AGENT_MODULE_STATUS_WARNING:
                     $status_img = ui_print_status_image(STATUS_MODULE_WARNING, __('Warning'), true);
                 break;
 
-                case 3:
+                case AGENT_MODULE_STATUS_UNKNOWN:
                     $status_img = ui_print_status_image(STATUS_MODULE_UNKNOWN, __('Unknown'), true);
                 break;
 
-                case 5:
+                case AGENT_MODULE_STATUS_NO_DATA:
+                case AGENT_MODULE_STATUS_NOT_INIT:
                     $status_img = ui_print_status_image(STATUS_MODULE_NO_DATA, __('Not init'), true);
                 break;
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index e490135734..866c14494a 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -523,7 +523,19 @@ class ModulesByStatus extends Widget
                 unset($expl[$exist]);
             }
 
-            array_push($expl, '1', '2');
+            array_push($expl, '1', '2', '3', '4', '5');
+
+            $status = implode(',', $expl);
+        }
+
+        if (str_contains($status, '5') === true) {
+            $expl = explode(',', $status);
+            $exist = array_search('5', $expl);
+            if (isset($exist) === true) {
+                unset($expl[$exist]);
+            }
+
+            array_push($expl, '4', '5');
 
             $status = implode(',', $expl);
         }

From a41d2214e6343e6d44081e35213b724356be689e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Fri, 19 Jan 2024 09:33:53 +0100
Subject: [PATCH 32/62] #12767 Fixed password 2

---
 pandora_console/include/styles/pandora.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 7c188058f3..526a6b73f8 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -11843,7 +11843,7 @@ p.trademark-copyright {
 }
 
 .show-hide-pass {
-  position: fixed;
+  position: absolute;
   border: 0;
   outline: none;
   margin-left: -50px;
@@ -12077,7 +12077,7 @@ div.relative > div > div#ui-datepicker-div {
 }
 
 .container-div-input-password {
-  display: inline !important;
+  display: block !important;
 }
 
 #message_dialog_connection {

From f43279acc35e6ff075586e0ef261b79f1bbbcbb6 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 22 Jan 2024 09:27:02 +0100
Subject: [PATCH 33/62] #12777 qr name remove entities

---
 pandora_console/godmode/users/user_management.php |  2 +-
 pandora_console/include/javascript/qrcode.js      | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php
index 7a5abb8503..4fa30a253e 100644
--- a/pandora_console/godmode/users/user_management.php
+++ b/pandora_console/godmode/users/user_management.php
@@ -985,7 +985,7 @@ html_print_table($userManagementTable);
 
 $vcard_data = [];
 $vcard_data['version'] = '3.0';
-$vcard_data['firstName'] = $user_info['fullname'];
+$vcard_data['firstName'] = io_safe_output($user_info['fullname']);
 $vcard_data['lastName'] = '';
 $vcard_data['middleName'] = '';
 $vcard_data['workPhone'] = $user_info['phone'];
diff --git a/pandora_console/include/javascript/qrcode.js b/pandora_console/include/javascript/qrcode.js
index 4f664b4659..33f38e1b6f 100644
--- a/pandora_console/include/javascript/qrcode.js
+++ b/pandora_console/include/javascript/qrcode.js
@@ -2413,22 +2413,11 @@ date: 2018-05-14 15:05:04
       });
     }
 
+    console.log(vCard);
     formattedVCardString +=
       "FN" + encodingPrefix + ":" + e(formattedName) + nl();
     formattedVCardString +=
-      "N" +
-      encodingPrefix +
-      ":" +
-      e(vCard.lastName) +
-      ";" +
-      e(vCard.firstName) +
-      ";" +
-      e(vCard.middleName) +
-      ";" +
-      e(vCard.namePrefix) +
-      ";" +
-      e(vCard.nameSuffix) +
-      nl();
+      "N" + encodingPrefix + ":" + e(vCard.firstName) + nl();
 
     if (vCard.nickname && majorVersion >= 3) {
       formattedVCardString +=

From 5d5bfc654dfaad238c62540ba0819fef810e8f86 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 22 Jan 2024 12:39:43 +0100
Subject: [PATCH 34/62] #12753 fixed os command injection

---
 pandora_console/include/ajax/events.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 007ba77d89..851a22040b 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -1335,6 +1335,15 @@ if ($perform_event_response === true) {
     }
 
     $command = $event_response['target'];
+
+    // Prevent OS command injection.
+    $prev_command = get_events_get_response_target($event_id, $event_response, $server_id);
+
+    if ($command !== $prev_command) {
+        echo __('unauthorized');
+        return;
+    }
+
     $command_timeout = ($event_response !== false) ? $event_response['command_timeout'] : 90;
     if (enterprise_installed() === true) {
         if ($event_response !== false

From 54e3f94d62cd0dfdeaa84ee5c6c3edb790c59268 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 22 Jan 2024 15:07:25 +0100
Subject: [PATCH 35/62] #12782 fixed button sound events style in events

---
 pandora_console/include/styles/events.css   | 16 ++++++++++++++++
 pandora_console/operation/events/events.php |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 9a69ea8c56..4e3da3194c 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -569,3 +569,19 @@ div.container-filter-buttons {
 .ui-dialog.modal-sound .ui-widget-header {
   display: flex !important;
 }
+
+.responsive_button_sound_events {
+  margin-right: 25% !important;
+}
+
+@media (max-width: 1640px) {
+  .responsive_button_sound_events {
+    margin-right: 10% !important;
+  }
+}
+
+@media (max-width: 1420px) {
+  .responsive_button_sound_events {
+    margin-right: 10px !important;
+  }
+}
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 79fe087a52..31d4336928 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -2951,8 +2951,8 @@ if (check_acl(
         false,
         'openSoundEventsDialog("'.$data_sound.'")',
         [
+            'class'          => 'responsive_button_sound_events',
             'icon'           => 'sound',
-            'style'          => 'margin-right: 25% !important',
             'minimize-arrow' => true,
             'span_style'     => 'width: 100%',
         ],

From 6948306d820c48a090dabb4ea47ad75a4f920692 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Mon, 22 Jan 2024 17:29:51 +0100
Subject: [PATCH 36/62] #12767 Fixed password 3

---
 pandora_console/include/functions_html.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 06ab07598d..7052450b5f 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2728,8 +2728,8 @@ function html_print_input_text_extended(
     if ($hide_div_eye !== false) {
         echo "<script>
         $(document).ready (function () {
-            $('input[name=\"".$name."\"]').val(\"".$value."\")
-            
+            $('input[name=\"".$name."\"]').val(\"".$value."\");
+
             observerInputPassword('".$name."');
         });
         </script>";
@@ -2746,9 +2746,11 @@ function html_print_input_text_extended(
     ];
 
     foreach ($attrs as $attribute => $default) {
-        if (array_key_exists($attribute, $attributes)) {
+        if (array_key_exists($attribute, $attributes)
+            || ($password === true && $attribute === 'value')
+        ) {
             continue;
-        } //end if
+        }
 
         /*
          * Remember, this next code have a $$ that for example there is a var as
@@ -2758,7 +2760,7 @@ function html_print_input_text_extended(
          *
          */
 
-        // Exact operator because we want to show "0" on the value
+        // Exact operator because we want to show "0" on the value.
         if ($attribute !== '') {
             $output .= $attribute.'="'.$$attribute.'" ';
         } else if ($default != '') {
@@ -2789,6 +2791,12 @@ function html_print_input_text_extended(
             ],
             true
         );
+
+        echo "<script>
+        $(document).ready (function () {
+            $('input[name=\"".$name."\"]').val(\"".$value.'");
+        });
+        </script>';
     }
 
     if (!$return) {

From 510c28bb0925943cb74eb4bcda1b86d3e7349898 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Tue, 23 Jan 2024 10:56:31 +0100
Subject: [PATCH 37/62] #12698 fix welcome messages

---
 .../lib/TacticalView/GeneralTacticalView.php  | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
index e00bc8fcf8..06e27e4fd6 100644
--- a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
+++ b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
@@ -224,18 +224,33 @@ class GeneralTacticalView
         $zone_location = $date_zone->getLocation();
         $latitude = $zone_location['latitude'];
 
-        $emojiOptions = [
-            'have_good_day'   => __('Have a good day %s ✌', $name),
-            'welcome_back'    => __('Welcome back! %s 👋', $name),
-            'merry_christmas' => __('Welcome back! %s 🎅', $name),
-            'good_morning'    => __('Good morning, %s! ☕', $name),
-            'good_evening'    => __('Good evening, %s 🌇', $name),
-            'good_night'      => __('Good night, %s 🌕', $name),
-            'happy_summer'    => __('Happy summer, %s 🌞', $name),
-            'happy_winter'    => __('Happy winter, %s ⛄', $name),
-            'happy_autumn'    => __('Happy autumn, %s 🍂', $name),
-            'happy_spring'    => __('Happy spring, %s 🌻', $name),
-        ];
+        if ($name !== '') {
+            $emojiOptions = [
+                'have_good_day'   => __('Have a good day %s ✌', $name),
+                'welcome_back'    => __('Welcome back! %s 👋', $name),
+                'merry_christmas' => __('Welcome back! %s 🎅', $name),
+                'good_morning'    => __('Good morning, %s! ☕', $name),
+                'good_evening'    => __('Good evening, %s 🌇', $name),
+                'good_night'      => __('Good night, %s 🌕', $name),
+                'happy_summer'    => __('Happy summer, %s 🌞', $name),
+                'happy_winter'    => __('Happy winter, %s ⛄', $name),
+                'happy_autumn'    => __('Happy autumn, %s 🍂', $name),
+                'happy_spring'    => __('Happy spring, %s 🌻', $name),
+            ];
+        } else {
+            $emojiOptions = [
+                'have_good_day'   => __('Have a good day ✌'),
+                'welcome_back'    => __('Welcome back! 👋'),
+                'merry_christmas' => __('Welcome back! 🎅'),
+                'good_morning'    => __('Good morning! ☕'),
+                'good_evening'    => __('Good evening 🌇'),
+                'good_night'      => __('Good night 🌕'),
+                'happy_summer'    => __('Happy summer 🌞'),
+                'happy_winter'    => __('Happy winter ⛄'),
+                'happy_autumn'    => __('Happy autumn 🍂'),
+                'happy_spring'    => __('Happy spring 🌻'),
+            ];
+        }
 
         // Welcome back.
         $user_last_connect = $user['last_connect'];

From cd27935b4c762621ec855471023020fc1f95bd9a Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Tue, 23 Jan 2024 11:26:15 +0100
Subject: [PATCH 38/62] #12623 fix menu inventory modules

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

diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index ca67825da1..37d4e11c38 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -155,6 +155,8 @@ function menu_print_menu(&$menu)
         }
     } else if ($sec2 === 'godmode/users/configure_user') {
         $sec2 = 'godmode/users/user_list';
+    } else if ($sec2 === 'godmode/modules/manage_inventory_modules_form') {
+        $sec2 = 'godmode/modules/manage_inventory_modules';
     } else if ($sec2 === 'godmode/groups/configure_group') {
         $sec2 = 'godmode/groups/group_list';
     } else if ($sec2 === 'godmode/users/configure_profile') {

From fc08e9b9b657df8c3b3e2454c1cb10f0f311c281 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Tue, 23 Jan 2024 11:27:15 +0100
Subject: [PATCH 39/62] #12792 fix 500 change agent inventory

---
 pandora_console/include/ajax/inventory.ajax.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/ajax/inventory.ajax.php b/pandora_console/include/ajax/inventory.ajax.php
index 71fac8d0ec..207adde03d 100644
--- a/pandora_console/include/ajax/inventory.ajax.php
+++ b/pandora_console/include/ajax/inventory.ajax.php
@@ -26,7 +26,8 @@
  * ============================================================================
  */
 
- check_login();
+require_once $config['homedir'].'/include/functions_inventory.php';
+check_login();
 
 if (is_ajax() === true) {
     $id_agent = get_parameter('id_agent', '0');

From 3026c9d50dc47aac8932b859f7b6fb8a2e6e0ff4 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Tue, 23 Jan 2024 16:27:07 +0100
Subject: [PATCH 40/62] #12786 fix wizard open out of index

---
 pandora_console/general/register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 759e319dbd..ed583c7ed4 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -100,7 +100,7 @@ if ($initial && users_is_admin()) {
     );
 }
 
-if (check_acl($config['id_user'], 0, 'AW')) {
+if (check_acl($config['id_user'], 0, 'AW') && empty($sec2)) {
     $welcome = !$initial;
     try {
         $welcome_window = new WelcomeWindow($welcome);

From 538177c3e5b34df01527948183722236b2dac274 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Tue, 23 Jan 2024 17:08:06 +0100
Subject: [PATCH 41/62] #12753 fixed vul command in ajax

---
 pandora_console/include/functions_events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index cd22b55f1b..e328f4cd91 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3804,7 +3804,7 @@ function events_get_response_target(
     }
 
     $event = db_get_row('tevento', 'id_evento', $event_id);
-    $target = io_safe_output($event_response['target']);
+    $target = io_safe_output(db_get_value('target', 'tevent_response', 'id', $event_response['id']));
 
     // Replace parameters response.
     if (isset($response_parameters) === true

From dd252daaf2072a2435b67e788117bbe9d3c4f18f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 24 Jan 2024 01:00:32 +0100
Subject: [PATCH 42/62] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e7c241251a..da5db137f5 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.775-240123
+Version: 7.0NG.775-240124
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 00e1bec872..4617d8e745 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240123"
+pandora_version="7.0NG.775-240124"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 40317705f1..4ec522db43 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.775';
-use constant AGENT_BUILD => '240123';
+use constant AGENT_BUILD => '240124';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 8ed67cacd8..2786cafe56 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index e073b7a1b6..92cb781d5a 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index ca44c46126..56dc5c9c0c 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 857491d509..858147650c 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 1491df0b07..deff8bc50f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 0232a6bf8c..9a94ff4cb4 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240123"
+PI_BUILD="240124"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 74ffb7b496..dd51dcf708 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{240123}
+{240124}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8e094eedae..22f49347f0 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.775 Build 240123")
+#define PANDORA_VERSION ("7.0NG.775 Build 240124")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index b7d17d6756..cf88101947 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.775(Build 240123))"
+      VALUE "ProductVersion", "(7.0NG.775(Build 240124))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4d832ca478..d23840e972 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.775-240123
+Version: 7.0NG.775-240124
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 95ee569569..4c11ce1bce 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240123"
+pandora_version="7.0NG.775-240124"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 6c993cc7ca..60dd8bf9a1 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC240123';
+$build_version = 'PC240124';
 $pandora_version = 'v7.0NG.775';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 6d491a85cb..ab50a8ec91 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.775';
-            $build = '240123';
+            $build = '240124';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 240363e351..0f0a52ce55 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 4bc4adcc85..09ddf1fe41 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e6969db9dc..8c87ebe591 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 31213f6c47..54a937ad6b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.775-240123
+Version: 7.0NG.775-240124
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index dae47c3d07..da1ba60728 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240123"
+pandora_version="7.0NG.775-240124"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b1f43fea3a..5bc2fb63c4 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.775";
-my $pandora_build = "240123";
+my $pandora_build = "240124";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 02ea63cb23..c9a94e7afa 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.775";
-my $pandora_build = "240123";
+my $pandora_build = "240124";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 251e09b74e..d76f4f73f5 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6c05f78ac2..fdafb2797e 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.775
-%define release     240123
+%define release     240124
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index effa474fba..2202c82563 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240123"
+PI_BUILD="240124"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2ab5d89b6a..47f6f469ab 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240123";
+my $version = "7.0NG.775 Build 240124";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2d1eec0b82..7801143234 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240123";
+my $version = "7.0NG.775 Build 240124";
 
 # save program name for logging
 my $progname = basename($0);

From 4fc3013cc3b15ef4981a1b5fdcc6688da65585b9 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Wed, 24 Jan 2024 09:15:32 +0100
Subject: [PATCH 43/62] #12522 fixed multiple audit when update setup

---
 pandora_console/include/functions_config.php | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 9f4c38aa68..0f552ac519 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -104,6 +104,7 @@ function config_update_value($token, $value, $noticed=false, $password=false)
         return true;
     }
 
+    $prev_value = $config[$token];
     $config[$token] = $value;
     $value = io_safe_output($value);
 
@@ -117,13 +118,24 @@ function config_update_value($token, $value, $noticed=false, $password=false)
         return true;
     } else {
         // Something in setup changes.
-        if ($noticed === true) {
+        $value_token = (empty($config[$token]) === true) ? 0 : $config[$token];
+        $prev_value = (empty($prev_value) === true) ? 0 : $prev_value;
+        if (is_array($prev_value) === true) {
+            $prev_value = implode(';', $prev_value);
+        }
+
+        if ($noticed === true && $prev_value !== $value_token) {
             db_pandora_audit(
                 AUDIT_LOG_SETUP,
                 'Setup has changed',
                 false,
                 false,
-                sprintf('Token << %s >> updated.', $token)
+                sprintf(
+                    'Token << %s >> updated %s -> %s',
+                    $token,
+                    $prev_value,
+                    $value_token
+                )
             );
         }
 
@@ -2090,11 +2102,6 @@ function config_update_config()
     } else {
         $config['error_config_update_config'] = [];
         $config['error_config_update_config']['correct'] = true;
-
-        db_pandora_audit(
-            AUDIT_LOG_SETUP,
-            'Setup has changed'
-        );
     }
 
     if (count($errors) > 0) {

From 4e523e94cce55b4c3c025a2b430aaf3ac1198907 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Wed, 24 Jan 2024 09:51:35 +0100
Subject: [PATCH 44/62] #12574 fix datepicker and give style

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

diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 6f09d889f7..d06ff90118 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -283,8 +283,14 @@ function mainInsertData()
             secondText: '<?php echo __('Second'); ?>',
             currentText: '<?php echo __('Now'); ?>',
             closeText: '<?php echo __('Close'); ?>'});
-        
-        $("#text-date").datepicker({dateFormat: "<?php echo DATE_FORMAT_JS; ?>"});
+
+        $('#text-data').datepicker ({
+            dateFormat: '<?php echo DATE_FORMAT_JS; ?>',
+            changeMonth: true,
+            changeYear: true,
+            showAnim: 'slideDown',
+            firstDay: "<?php echo $config['datepicker_first_day']; ?>",
+        });
         
         $.datepicker.setDefaults($.datepicker.regional[ "<?php echo get_user_language(); ?>"]);
     });

From bfb34d1c75dd02138c4aa7fd9c6ad98e46b634b6 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Wed, 24 Jan 2024 11:56:58 +0100
Subject: [PATCH 45/62] #12719. Fix creating duplicated agents on tagente

---
 pandora_server/lib/PandoraFMS/DataServer.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 80e8bb4bd3..9db3f0f7ce 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -418,8 +418,10 @@ sub process_xml_data ($$$$$) {
 	# A module with No-learn mode (modo = 0) creates its modules on database only when it is created 
 	my $new_agent = 0;
 	
-	# Get agent id
-	my $agent_id = get_agent_id ($dbh, $agent_name);
+	# Get agent id from tagente.
+	my $agent_id = get_db_value ($dbh, "SELECT id_agente FROM tagente WHERE nombre = ?", safe_input($agent_name));
+	$agent_id = -1 unless defined($agent_id);
+
 	my $group_id = 0;
 	if ($agent_id < 1) {
 		if ($pa_config->{'autocreate'} == 0) {

From 8bbfa2803f86b3282d55183f0233eeba0891160a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 25 Jan 2024 01:00:29 +0100
Subject: [PATCH 46/62] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index da5db137f5..b57934fc50 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.775-240124
+Version: 7.0NG.775-240125
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 4617d8e745..cc3cf84853 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240124"
+pandora_version="7.0NG.775-240125"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 4ec522db43..b0f1c9f54c 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.775';
-use constant AGENT_BUILD => '240124';
+use constant AGENT_BUILD => '240125';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 2786cafe56..516ef3ec99 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index 92cb781d5a..c0ff5e3f44 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index 56dc5c9c0c..14870a78ed 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 858147650c..1e88ca4c7e 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index deff8bc50f..515dc4ea4d 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 9a94ff4cb4..20f63af782 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240124"
+PI_BUILD="240125"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index dd51dcf708..81661ca1bf 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{240124}
+{240125}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 22f49347f0..91adc36bc7 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.775 Build 240124")
+#define PANDORA_VERSION ("7.0NG.775 Build 240125")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cf88101947..5ac5a2e47f 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.775(Build 240124))"
+      VALUE "ProductVersion", "(7.0NG.775(Build 240125))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d23840e972..971ba8b024 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.775-240124
+Version: 7.0NG.775-240125
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 4c11ce1bce..6e7853f74f 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240124"
+pandora_version="7.0NG.775-240125"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 60dd8bf9a1..0cbf1c15e8 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC240124';
+$build_version = 'PC240125';
 $pandora_version = 'v7.0NG.775';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ab50a8ec91..1e2252fbae 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.775';
-            $build = '240124';
+            $build = '240125';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 0f0a52ce55..4b7e8b0da0 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 09ddf1fe41..ca4ab9657e 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 8c87ebe591..977a58e4fe 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 54a937ad6b..4ea2ca557b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.775-240124
+Version: 7.0NG.775-240125
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index da1ba60728..ef81d3e503 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240124"
+pandora_version="7.0NG.775-240125"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index e5eb8ca321..b25686ee4b 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.775";
-my $pandora_build = "240124";
+my $pandora_build = "240125";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index c9a94e7afa..020d69c4b3 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.775";
-my $pandora_build = "240124";
+my $pandora_build = "240125";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index d76f4f73f5..829d5ae091 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index fdafb2797e..c697aa9c8f 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.775
-%define release     240124
+%define release     240125
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2202c82563..03fa6a84d0 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240124"
+PI_BUILD="240125"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 47f6f469ab..66e75586cb 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240124";
+my $version = "7.0NG.775 Build 240125";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7801143234..b154b38ada 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240124";
+my $version = "7.0NG.775 Build 240125";
 
 # save program name for logging
 my $progname = basename($0);

From 7b988664686a47e747292a83ad88cc35634db67b Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Thu, 25 Jan 2024 10:38:24 +0100
Subject: [PATCH 47/62] #12681 fixed decimals in df_percent_used

---
 pandora_agents/win32/bin/util/df_percent_used.vbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_agents/win32/bin/util/df_percent_used.vbs b/pandora_agents/win32/bin/util/df_percent_used.vbs
index 8499e8694f..090abf8ce7 100644
--- a/pandora_agents/win32/bin/util/df_percent_used.vbs
+++ b/pandora_agents/win32/bin/util/df_percent_used.vbs
@@ -25,7 +25,7 @@ For Each objItem in colItems
 	If argc = 0 Or argv.Exists(objItem.Name) Then
 		' Include only harddrivers (type 3)
 		If (objItem.FreeSpace <> "") AND (objItem.DriveType =3) Then
-			Percent = round (100 - (objItem.FreeSpace / objItem.Size) * 100, 2)
+			Percent = round (100 - (objItem.FreeSpace / objItem.Size) * 100, 0)
 			Wscript.StdOut.WriteLine "<module>"
 			Wscript.StdOut.WriteLine "    <name><![CDATA[DiskUsed_" & objItem.Name & "]]></name>"
 			Wscript.StdOut.WriteLine "    <description><![CDATA[% used space. Filesystem unit:  " & objItem.Name & "]]></description>"

From 874bd04aa82c4c9b25ef9358b4fa3f7183329f89 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Thu, 25 Jan 2024 15:23:48 +0100
Subject: [PATCH 48/62] #11799 hide interval for broker agents

---
 pandora_agents/pc/pandora_agent               |  2 +-
 pandora_agents/unix/pandora_agent             |  2 +-
 .../godmode/agentes/agent_manager.php         | 45 ++++++++++++-------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/pandora_agents/pc/pandora_agent b/pandora_agents/pc/pandora_agent
index 88f78e31ac..50e901f0ce 100644
--- a/pandora_agents/pc/pandora_agent
+++ b/pandora_agents/pc/pandora_agent
@@ -585,7 +585,7 @@ sub write_broker_conf($){
 		
 		# Change the agent name
 		if ($line =~ m/^\s*#*\s*agent_name\s+/) {
-			$line = "agent_name $broker_agent\n";
+			$line = "agent_name $broker_agent\n#broker active\n";
 		}
 		# Change the logfile
 		elsif ($line =~ m/^\s*logfile\s+(.*)/) {
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index b0f1c9f54c..62aa2e5040 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1860,7 +1860,7 @@ sub write_broker_conf($){
 
 		# Change the agent name
 		if ($line =~ m/^\s*#*\s*agent_name\s+/) {
-			$line = "agent_name $broker_agent\n";
+			$line = "agent_name $broker_agent\n#broker active\n";
 		}
 		# Change the logfile
 		elsif ($line =~ m/^\s*logfile\s+(.*)/) {
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 4e62337547..28b8da32d3 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -499,22 +499,37 @@ $tableAgent->data['primary_group'][0] .= ui_print_group_icon(
     'after_input_icon'
 );
 $tableAgent->data['primary_group'][0] .= '</span>';
+// CHECK BROKER FOR SHOW INTERVAL.
+enterprise_include('include/functions_config_agents.php');
+// Read configuration file.
+$files = config_agents_get_agent_config_filenames($id_agente);
+$file_name = $files['conf'];
+$agent_config = file_get_contents($file_name);
+$encoding = 'UTF-8';
+$agent_config_utf8 = mb_convert_encoding($agent_config, 'UTF-8', $encoding);
+if ($agent_config_utf8 !== false) {
+    $agent_config = $agent_config_utf8;
+}
 
-$tableAgent->data['caption_interval'][0] = __('Interval');
-// $tableAgent->rowstyle['interval'] = 'width: 260px';
-$tableAgent->rowclass['interval'] = 'w540px';
-$tableAgent->data['interval'][0] = html_print_extended_select_for_time(
-    'intervalo',
-    $intervalo,
-    '',
-    '',
-    '0',
-    10,
-    true,
-    false,
-    true,
-    'w33p'
-);
+$broker = str_contains($agent_config, '#broker active');
+
+if ($broker === false) {
+    $tableAgent->data['caption_interval'][0] = __('Interval');
+    // $tableAgent->rowstyle['interval'] = 'width: 260px';
+    $tableAgent->rowclass['interval'] = 'w540px';
+    $tableAgent->data['interval'][0] = html_print_extended_select_for_time(
+        'intervalo',
+        $intervalo,
+        '',
+        '',
+        '0',
+        10,
+        true,
+        false,
+        true,
+        'w33p'
+    );
+}
 
 if ($intervalo < SECONDS_5MINUTES) {
     $tableAgent->data['interval'][0] .= clippy_context_help('interval_agent_min');

From cdd9af51080abfaec2be7b6c32a6e446a1203721 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Thu, 25 Jan 2024 15:25:08 +0100
Subject: [PATCH 49/62] #11799 hide interval for broker agents

---
 .../godmode/agentes/agent_manager.php         | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 28b8da32d3..80a480dd12 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -499,19 +499,23 @@ $tableAgent->data['primary_group'][0] .= ui_print_group_icon(
     'after_input_icon'
 );
 $tableAgent->data['primary_group'][0] .= '</span>';
-// CHECK BROKER FOR SHOW INTERVAL.
-enterprise_include('include/functions_config_agents.php');
-// Read configuration file.
-$files = config_agents_get_agent_config_filenames($id_agente);
-$file_name = $files['conf'];
-$agent_config = file_get_contents($file_name);
-$encoding = 'UTF-8';
-$agent_config_utf8 = mb_convert_encoding($agent_config, 'UTF-8', $encoding);
-if ($agent_config_utf8 !== false) {
-    $agent_config = $agent_config_utf8;
-}
 
-$broker = str_contains($agent_config, '#broker active');
+$broker = false;
+if (enterprise_installed()) {
+    // CHECK BROKER FOR SHOW INTERVAL.
+    enterprise_include('include/functions_config_agents.php');
+    // Read configuration file.
+    $files = config_agents_get_agent_config_filenames($id_agente);
+    $file_name = $files['conf'];
+    $agent_config = file_get_contents($file_name);
+    $encoding = 'UTF-8';
+    $agent_config_utf8 = mb_convert_encoding($agent_config, 'UTF-8', $encoding);
+    if ($agent_config_utf8 !== false) {
+        $agent_config = $agent_config_utf8;
+    }
+
+    $broker = str_contains($agent_config, '#broker active');
+}
 
 if ($broker === false) {
     $tableAgent->data['caption_interval'][0] = __('Interval');

From 18cb14bec6c45dd897cb5ca5598628b780d488b0 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 25 Jan 2024 16:03:48 +0100
Subject: [PATCH 50/62] minor fixes

---
 pandora_console/include/functions_netflow.php | 25 +++++++++++++++----
 .../include/functions_reporting.php           | 14 +++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index 770314f507..5fc9e6b32f 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -1553,8 +1553,7 @@ function netflow_draw_item(
 
             if ($output === 'HTML' || $output === 'PDF') {
                 $html = '<table class="w100p">';
-
-                if ($show_graph === true && $max_aggregates <= 10) {
+                if ($show_graph === true) {
                     $labels = array_map(
                         function ($conn) {
                             return __('% Traffic').' '.$conn['ip_src'].' - '.$conn['ip_dst'];
@@ -1572,18 +1571,34 @@ function netflow_draw_item(
                     $graph_output = pie_graph(
                         $pie_data,
                         [
-                            'legend' => [
+                            'width'     => 200,
+                            'height'    => 200,
+                            'ttl'       => ($output === 'PDF') ? 2 : 1,
+                            'dataLabel' => ['display' => 'auto'],
+                            'layout'    => [
+                                'padding' => [
+                                    'top'    => 15,
+                                    'bottom' => 15,
+                                ],
+                            ],
+                            'legend'    => [
                                 'display'  => true,
                                 'position' => 'right',
                                 'align'    => 'center',
                             ],
-                            'labels' => $labels,
+                            'labels'    => $labels,
                         ]
                     );
 
                     $html .= '<tr>';
                     $html .= "<td class='w500p padding-bottom-25px'>";
-                    $html .= $graph_output;
+
+                    if ($output === 'PDF') {
+                        $html .= '<img src="data:image/png;base64,'.$graph_output.'" />';
+                    } else {
+                        $html .= $graph_output;
+                    }
+
                     $html .= '</td>';
                     $html .= '</tr>';
                 }
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 2b8a0f01ef..8cc539879c 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -7036,11 +7036,15 @@ function reporting_netflow(
         break;
     }
 
-    $return['subtitle'] = netflow_generate_subtitle_report(
-        $filter['aggregate'],
-        $content['top_n'],
-        $type_netflow
-    );
+    if ($extended === true) {
+        $return['subtitle'] = __('InBound/Outbound traffic per SrcIP/DestIP');
+    } else {
+        $return['subtitle'] = netflow_generate_subtitle_report(
+            $filter['aggregate'],
+            $content['top_n'],
+            $type_netflow
+        );
+    }
 
     return reporting_check_structure_content($return);
 }

From cf500b68438fb1f90fcdcdc1f6b003afdd2d0f37 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Thu, 25 Jan 2024 16:41:58 +0100
Subject: [PATCH 51/62] #12681 added decimals in module module_freepercentdisk

---
 pandora_agents/unix/pandora_agent                 | 2 +-
 pandora_agents/win32/bin/util/df_percent_used.vbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 4ec522db43..956fb984d8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -3132,7 +3132,7 @@ sub module_freepercentdisk ($) {
 
 	return () unless defined ($Parts{$module->{'params'}}) and defined ($Parts{$module->{'params'}}{'avail'});
 	
-	my $availp = sprintf("%d", $Parts{$module->{'params'}}{'avail'} * 100 / $Parts{$module->{'params'}}{'total'});
+	my $availp = sprintf("%.2f", $Parts{$module->{'params'}}{'avail'} * 100 / $Parts{$module->{'params'}}{'total'});
 	return ($availp);
 }
 
diff --git a/pandora_agents/win32/bin/util/df_percent_used.vbs b/pandora_agents/win32/bin/util/df_percent_used.vbs
index 090abf8ce7..8499e8694f 100644
--- a/pandora_agents/win32/bin/util/df_percent_used.vbs
+++ b/pandora_agents/win32/bin/util/df_percent_used.vbs
@@ -25,7 +25,7 @@ For Each objItem in colItems
 	If argc = 0 Or argv.Exists(objItem.Name) Then
 		' Include only harddrivers (type 3)
 		If (objItem.FreeSpace <> "") AND (objItem.DriveType =3) Then
-			Percent = round (100 - (objItem.FreeSpace / objItem.Size) * 100, 0)
+			Percent = round (100 - (objItem.FreeSpace / objItem.Size) * 100, 2)
 			Wscript.StdOut.WriteLine "<module>"
 			Wscript.StdOut.WriteLine "    <name><![CDATA[DiskUsed_" & objItem.Name & "]]></name>"
 			Wscript.StdOut.WriteLine "    <description><![CDATA[% used space. Filesystem unit:  " & objItem.Name & "]]></description>"

From 1c094cd2193b8ba1aebc9929c14f4cd410e47f54 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Thu, 25 Jan 2024 16:58:21 +0100
Subject: [PATCH 52/62] #12802 fix date error

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

diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index d06ff90118..98e8886733 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -223,7 +223,7 @@ function mainInsertData()
         '',
         empty($agent_id)
     );
-    $table->data[1][2] = html_print_input_text('data', ($save === true) ? date(DATE_FORMAT) : $data, __('Data'), 10, 60, true);
+    $table->data[1][2] = html_print_input_text('date', ($save === true) ? date(DATE_FORMAT) : $data, __('Data'), 10, 60, true);
     $table->data[1][2] .= '&nbsp;';
     $table->data[1][2] .= html_print_input_text('time', ($save === true) ? date(TIME_FORMAT) : $time, '', 10, 7, true);
 
@@ -284,7 +284,7 @@ function mainInsertData()
             currentText: '<?php echo __('Now'); ?>',
             closeText: '<?php echo __('Close'); ?>'});
 
-        $('#text-data').datepicker ({
+        $('#text-date').datepicker ({
             dateFormat: '<?php echo DATE_FORMAT_JS; ?>',
             changeMonth: true,
             changeYear: true,

From 31312eaa53083e9c7dac7a9803ed071f914a73c3 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 25 Jan 2024 17:19:05 +0100
Subject: [PATCH 53/62] visual fix

---
 pandora_console/godmode/events/event_responses.editor.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index 477aa70e85..52d5a48ad1 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -292,7 +292,12 @@ $data[0] = html_print_label_input_block(
         '',
         '',
         '',
-        true
+        true,
+        false,
+        true,
+        'w100p',
+        false,
+        'width: 100%'
     ).'</div>'
 );
 

From 823e2b93aea8ef2f52cd6a480631c91d9aabbf24 Mon Sep 17 00:00:00 2001
From: "felix.suarez" <felix.suarez@pandorafms.com>
Date: Thu, 25 Jan 2024 14:10:59 -0600
Subject: [PATCH 54/62] Add Powershell module

---
 pandora_agents/win32/Makefile.am              |  4 +-
 .../win32/modules/pandora_module.cc           |  2 +
 pandora_agents/win32/modules/pandora_module.h | 40 ++++----
 .../modules/pandora_module_exec_powershell.cc | 91 +++++++++++++++++++
 .../modules/pandora_module_exec_powershell.h  | 43 +++++++++
 .../win32/modules/pandora_module_factory.cc   | 18 +++-
 .../win32/modules/pandora_module_list.cc      |  7 ++
 7 files changed, 183 insertions(+), 22 deletions(-)
 create mode 100644 pandora_agents/win32/modules/pandora_module_exec_powershell.cc
 create mode 100644 pandora_agents/win32/modules/pandora_module_exec_powershell.h

diff --git a/pandora_agents/win32/Makefile.am b/pandora_agents/win32/Makefile.am
index 4641081570..94e77312c4 100644
--- a/pandora_agents/win32/Makefile.am
+++ b/pandora_agents/win32/Makefile.am
@@ -1,9 +1,9 @@
 bin_PROGRAMS = PandoraAgent
 if DEBUG 
-PandoraAgent_SOURCES = misc/cron.cc misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc debug_new.cpp
+PandoraAgent_SOURCES = misc/cron.cc misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_exec_powershell.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc debug_new.cpp
 PandoraAgent_CXXFLAGS=-g -O0
 else
-PandoraAgent_SOURCES = misc/cron.cc misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_logchannel.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc
+PandoraAgent_SOURCES = misc/cron.cc misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_exec_powershell.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_logchannel.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc
 PandoraAgent_CXXFLAGS=-O2
 endif
 
diff --git a/pandora_agents/win32/modules/pandora_module.cc b/pandora_agents/win32/modules/pandora_module.cc
index 2df46ad9d5..69a801e96b 100644
--- a/pandora_agents/win32/modules/pandora_module.cc
+++ b/pandora_agents/win32/modules/pandora_module.cc
@@ -236,6 +236,8 @@ Module_Kind
 Pandora_Module::parseModuleKindFromString (string kind) {
 	if (kind == module_exec_str) {
 		return MODULE_EXEC;
+	} else if (kind == module_exec_powershell_str) {
+		return MODULE_EXEC_POWERSHELL;
 	} else if (kind == module_proc_str) {
 		return MODULE_PROC;
 	} else if (kind == module_service_str) {
diff --git a/pandora_agents/win32/modules/pandora_module.h b/pandora_agents/win32/modules/pandora_module.h
index 111fc79c79..bb19b266b2 100644
--- a/pandora_agents/win32/modules/pandora_module.h
+++ b/pandora_agents/win32/modules/pandora_module.h
@@ -94,7 +94,8 @@ namespace Pandora_Modules {
 		MODULE_REGEXP,         /**< The module searches a file for matches of a regular expression */
 		MODULE_PLUGIN,          /**< Plugin */
 		MODULE_PING,            /**< Ping module */
-		MODULE_SNMPGET          /**< SNMP get module */
+		MODULE_SNMPGET,          /**< SNMP get module */
+		MODULE_EXEC_POWERSHELL      /**< The module run a custom powershell command */
 	} Module_Kind;
 	
 	/**
@@ -109,24 +110,25 @@ namespace Pandora_Modules {
 		regex_t regexp;
 	} Condition;
 
-	const string module_exec_str       = "module_exec";
-	const string module_proc_str       = "module_proc";
-	const string module_service_str    = "module_service";
-	const string module_freedisk_str   = "module_freedisk";
-	const string module_freedisk_percent_str   = "module_freedisk_percent";
-	const string module_freememory_str = "module_freememory";
-	const string module_freememory_percent_str = "module_freememory_percent";
-	const string module_cpuusage_str   = "module_cpuusage";
-	const string module_inventory_str  = "module_inventory";
-	const string module_logevent_str   = "module_logevent";	
-	const string module_logchannel_str   = "module_logchannel";
-	const string module_wmiquery_str   = "module_wmiquery";	
-	const string module_perfcounter_str = "module_perfcounter";
-	const string module_tcpcheck_str   = "module_tcpcheck";	
-	const string module_regexp_str     = "module_regexp";	
-	const string module_plugin_str     = "module_plugin";
-	const string module_ping_str       = "module_ping";	
-	const string module_snmpget_str    = "module_snmpget";	
+	const string module_exec_str       			= "module_exec";
+	const string module_proc_str       			= "module_proc";
+	const string module_service_str    			= "module_service";
+	const string module_freedisk_str   			= "module_freedisk";
+	const string module_freedisk_percent_str	= "module_freedisk_percent";
+	const string module_freememory_str 			= "module_freememory";
+	const string module_freememory_percent_str	= "module_freememory_percent";
+	const string module_cpuusage_str   			= "module_cpuusage";
+	const string module_inventory_str  			= "module_inventory";
+	const string module_logevent_str   			= "module_logevent";	
+	const string module_logchannel_str   		= "module_logchannel";
+	const string module_wmiquery_str   			= "module_wmiquery";	
+	const string module_perfcounter_str 		= "module_perfcounter";
+	const string module_tcpcheck_str   			= "module_tcpcheck";	
+	const string module_regexp_str     			= "module_regexp";	
+	const string module_plugin_str     			= "module_plugin";
+	const string module_ping_str       			= "module_ping";	
+	const string module_snmpget_str    			= "module_snmpget";
+	const string module_exec_powershell_str		= "module_exec_powershell";	
 	
 	/**
 	 * Pandora module super-class exception.
diff --git a/pandora_agents/win32/modules/pandora_module_exec_powershell.cc b/pandora_agents/win32/modules/pandora_module_exec_powershell.cc
new file mode 100644
index 0000000000..99d37b7822
--- /dev/null
+++ b/pandora_agents/win32/modules/pandora_module_exec_powershell.cc
@@ -0,0 +1,91 @@
+/* Pandora exec module. These modules exec a powershell command.
+
+   Copyright (c) 2006-2023 Pandora FMS.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#include "pandora_module_exec_powershell.h"
+#include "../pandora_strutils.h"
+
+#include <iostream>
+#include <stdexcept>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <cstdio>
+
+#define EXEC_OK 0
+#define EXEC_ERR -1
+#define BUFSIZE 4096
+
+using namespace Pandora;
+using namespace Pandora_Strutils;
+using namespace Pandora_Modules;
+
+/** 
+ * Creates a Pandora_Module_Exec_Powershell object.
+ * 
+ * @param name Module name
+ * @param exec Command to be executed.
+ */
+Pandora_Module_Exec_Powershell::Pandora_Module_Exec_Powershell(string name, string exec) 
+                                : Pandora_Module (name) {
+
+	string escaped_exec;
+
+    for (char c : exec) {
+        if (c == '"' || c == '\\') {
+            escaped_exec += '\\';  
+        }
+        escaped_exec += c;
+    }
+
+    this->module_exec = "powershell -C \"" + escaped_exec + "\"";
+
+    this->setKind (module_exec_powershell_str);
+}
+
+void Pandora_Module_Exec_Powershell::run() {
+	string output_result;
+
+    this->has_output = false;
+    
+    FILE* pipe = popen(this->module_exec.c_str(), "r");
+    if (!pipe) {
+        pandoraLog ("Error while executing command.", GetLastError ());
+        return;
+    }
+
+    char buffer[BUFSIZE];
+    while (fgets(buffer, BUFSIZE, pipe) != NULL) {
+        output_result += buffer;
+    }
+
+    int result = pclose(pipe);
+
+    if (result == EXEC_ERR) {
+        pandoraLog ("Error while closing command process.", GetLastError ());
+        return;
+    } 
+    
+    if (result != EXEC_OK) {
+        pandoraLog ("Error invalid powershell command.", GetLastError ());
+        return;
+    }
+
+	this->has_output = true;
+    this->setOutput (output_result);
+}
\ No newline at end of file
diff --git a/pandora_agents/win32/modules/pandora_module_exec_powershell.h b/pandora_agents/win32/modules/pandora_module_exec_powershell.h
new file mode 100644
index 0000000000..d3c9785c29
--- /dev/null
+++ b/pandora_agents/win32/modules/pandora_module_exec_powershell.h
@@ -0,0 +1,43 @@
+/* Pandora exec module. These modules exec a powershell command
+
+   Copyright (c) 2006-2023 Pandora FMS.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef	__PANDORA_MODULE_EXEC_POWERWSHELL_H__
+#define	__PANDORA_MODULE_EXEC_POWERWSHELL_H__
+
+#include "pandora_module.h"
+
+namespace Pandora_Modules {
+	/**
+	 * Module to execute a powershell command.
+	 *
+	 * Any custom order that want to be executed can be put in
+	 * the <code>util</code> directory into the Pandora agent path.
+	 */
+	class Pandora_Module_Exec_Powershell : public Pandora_Module {
+
+	private:
+		string module_exec;
+
+	public:
+		Pandora_Module_Exec_Powershell	(string name, string exec);
+		void run ();
+	};
+}
+
+#endif
diff --git a/pandora_agents/win32/modules/pandora_module_factory.cc b/pandora_agents/win32/modules/pandora_module_factory.cc
index de149293ff..dd71dc2dd8 100644
--- a/pandora_agents/win32/modules/pandora_module_factory.cc
+++ b/pandora_agents/win32/modules/pandora_module_factory.cc
@@ -22,6 +22,7 @@
 #include "pandora_module_factory.h"
 #include "pandora_module.h"
 #include "pandora_module_exec.h"
+#include "pandora_module_exec_powershell.h"
 #include "pandora_module_proc.h"
 #include "pandora_module_service.h"
 #include "pandora_module_freedisk.h"
@@ -129,6 +130,7 @@ using namespace Pandora_Strutils;
 #define TOKEN_ALERT_TEMPLATE ("module_alert_template")
 #define TOKEN_USER_SESSION ("module_user_session ")
 #define TOKEN_WAIT_TIMEOUT ("module_wait_timeout ")
+#define TOKEN_EXEC_POWERSHELL ("module_exec_powershell ")
 	
 string
 parseLine (string line, string token) {
@@ -158,7 +160,7 @@ Pandora_Module *
 Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	list<string>           tokens;
 	list<string>::iterator iter;
-	string                 module_name, module_type, module_exec;
+	string                 module_name, module_type, module_exec, module_exec_powershell;
 	string                 module_min, module_max, module_description;
 	string                 module_interval, module_absoluteinterval;
 	string                 module_proc, module_service;
@@ -268,6 +270,7 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	module_user_session	 = "";
 	macro   = "";
 	module_wait_timeout = "";
+	module_exec_powershell = "";
     
 	stringtok (tokens, definition, "\n");
 	
@@ -302,6 +305,9 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		if (module_exec == "") {
 			module_exec = parseLine (line, TOKEN_EXEC);
 		}
+		if (module_exec_powershell == "") {
+			module_exec_powershell = parseLine (line, TOKEN_EXEC_POWERSHELL);
+		}
 		if (module_wait_timeout == "") {
 			module_wait_timeout = parseLine (line, TOKEN_WAIT_TIMEOUT);
 		}
@@ -626,6 +632,13 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 					}
 				}
 
+				if (module_exec_powershell != "") {
+					pos_macro = module_exec_powershell.find(macro_name);
+					if (pos_macro != string::npos){
+						module_exec_powershell.replace(pos_macro, macro_name.size(), macro_value);
+					}
+				}
+
 				if (module_proc != "") {
 					pos_macro = module_proc.find(macro_name);
 					if (pos_macro != string::npos){
@@ -1155,6 +1168,9 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 			module->setWaitTimeout (atoi (module_wait_timeout.c_str ()));
 		}
 		
+	} else if (module_exec_powershell != "") {
+		module = new Pandora_Module_Exec_Powershell (module_name, module_exec_powershell);
+		
 	} else if (module_proc != "") {
 		module = new Pandora_Module_Proc (module_name,
 						  module_proc);
diff --git a/pandora_agents/win32/modules/pandora_module_list.cc b/pandora_agents/win32/modules/pandora_module_list.cc
index be5cc32d45..b0612902a3 100644
--- a/pandora_agents/win32/modules/pandora_module_list.cc
+++ b/pandora_agents/win32/modules/pandora_module_list.cc
@@ -21,6 +21,7 @@
 #include "pandora_module_factory.h"
 #include "pandora_module_list.h"
 #include "pandora_module_exec.h"
+#include "pandora_module_exec_powershell.h"
 #include "pandora_module_proc.h"
 #include "pandora_module_service.h"
 #include "pandora_module_freedisk.h"
@@ -235,6 +236,7 @@ Pandora_Modules::Pandora_Module_List::parseModuleDefinition (string definition)
     Pandora_Module_Plugin     *module_plugin;
     Pandora_Module_Ping       *module_ping;
     Pandora_Module_SNMPGet    *module_snmpget;
+	Pandora_Module_Exec_Powershell       *module_exec_powershell;
 
 	module = Pandora_Module_Factory::getModuleFromDefinition (definition);
 	
@@ -244,6 +246,11 @@ Pandora_Modules::Pandora_Module_List::parseModuleDefinition (string definition)
 			module_exec = (Pandora_Module_Exec *) module;
 			modules->push_back (module_exec);
 			
+			break;
+		case MODULE_EXEC_POWERSHELL:
+			module_exec_powershell = (Pandora_Module_Exec_Powershell *) module;
+			modules->push_back (module_exec_powershell);
+			
 			break;
 		case MODULE_PROC:
 			module_proc = (Pandora_Module_Proc *) module;

From c5cefb3c13e7f90b95b9f03755dfec0f88cd7941 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 26 Jan 2024 01:00:30 +0100
Subject: [PATCH 55/62] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control                    | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh        | 2 +-
 pandora_agents/unix/pandora_agent                     | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec         | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +-
 pandora_agents/unix/pandora_agent.redhat_bin.spec     | 2 +-
 pandora_agents/unix/pandora_agent.spec                | 2 +-
 pandora_agents/unix/pandora_agent_installer           | 2 +-
 pandora_agents/win32/installer/pandora.mpi            | 2 +-
 pandora_agents/win32/pandora.cc                       | 2 +-
 pandora_agents/win32/versioninfo.rc                   | 2 +-
 pandora_console/DEBIAN/control                        | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh            | 2 +-
 pandora_console/include/config_process.php            | 2 +-
 pandora_console/install.php                           | 2 +-
 pandora_console/pandora_console.redhat.spec           | 2 +-
 pandora_console/pandora_console.rhel7.spec            | 2 +-
 pandora_console/pandora_console.spec                  | 2 +-
 pandora_server/DEBIAN/control                         | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm               | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm          | 2 +-
 pandora_server/pandora_server.redhat.spec             | 2 +-
 pandora_server/pandora_server.spec                    | 2 +-
 pandora_server/pandora_server_installer               | 2 +-
 pandora_server/util/pandora_db.pl                     | 2 +-
 pandora_server/util/pandora_manage.pl                 | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index b57934fc50..c8ee8180a7 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.775-240125
+Version: 7.0NG.775-240126
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index cc3cf84853..fa783cc923 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240125"
+pandora_version="7.0NG.775-240126"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index b0f1c9f54c..e0f3e5bdc3 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.775';
-use constant AGENT_BUILD => '240125';
+use constant AGENT_BUILD => '240126';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 516ef3ec99..5c05e6110e 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
index c0ff5e3f44..78383784e9 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
index 14870a78ed..b21d106a96 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version
diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec
index 1e88ca4c7e..7a15966693 100644
--- a/pandora_agents/unix/pandora_agent.redhat_bin.spec
+++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec
@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 515dc4ea4d..337a0ec5f3 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 20f63af782..2f6e9c4d3d 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240125"
+PI_BUILD="240126"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 81661ca1bf..95fa0dd4a3 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{240125}
+{240126}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 91adc36bc7..f3961807fe 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.775 Build 240125")
+#define PANDORA_VERSION ("7.0NG.775 Build 240126")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5ac5a2e47f..1bb160a879 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.775(Build 240125))"
+      VALUE "ProductVersion", "(7.0NG.775(Build 240126))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 971ba8b024..466722a50b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.775-240125
+Version: 7.0NG.775-240126
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 6e7853f74f..a47efa89c2 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240125"
+pandora_version="7.0NG.775-240126"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0cbf1c15e8..a721e82c12 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC240125';
+$build_version = 'PC240126';
 $pandora_version = 'v7.0NG.775';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1e2252fbae..c6329db34e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.775';
-            $build = '240125';
+            $build = '240126';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 4b7e8b0da0..1636c764f3 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index ca4ab9657e..24aad437f3 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 977a58e4fe..c737ea2662 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 4ea2ca557b..2cef54da51 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.775-240125
+Version: 7.0NG.775-240126
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index ef81d3e503..7780111efc 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.775-240125"
+pandora_version="7.0NG.775-240126"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b25686ee4b..4d21988c3c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.775";
-my $pandora_build = "240125";
+my $pandora_build = "240126";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 020d69c4b3..c401b9410f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.775";
-my $pandora_build = "240125";
+my $pandora_build = "240126";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 829d5ae091..e7e972a801 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c697aa9c8f..f443bc4b03 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.775
-%define release     240125
+%define release     240126
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 03fa6a84d0..bc5676b742 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.775"
-PI_BUILD="240125"
+PI_BUILD="240126"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 66e75586cb..f079a42194 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240125";
+my $version = "7.0NG.775 Build 240126";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b154b38ada..e7921bff4a 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.775 Build 240125";
+my $version = "7.0NG.775 Build 240126";
 
 # save program name for logging
 my $progname = basename($0);

From c07ecff571a86fff706c65290698912beb2fdac7 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Fri, 26 Jan 2024 08:13:10 +0100
Subject: [PATCH 56/62] #12807 check id_agent for alert view

---
 .../operation/agentes/alerts_status.php       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index a4f7c7d81c..68988900bc 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -536,19 +536,21 @@ echo '</div>';
 ui_require_css_file('cluetip', 'include/styles/js/');
 ui_require_jquery_file('cluetip');
 
-$system_higher = false;
-$modules_agent = db_get_all_rows_sql(sprintf('SELECT id_agente FROM tagente_modulo WHERE id_agente = %s', $id_agente));
-if (is_array($modules_agent)) {
-    $all_modules = db_get_all_rows_sql('SELECT id_agente FROM tagente_modulo');
-    $all_agents = db_get_all_rows_sql('SELECT id_agente FROM tagente');
-    if (is_array($all_modules) && is_array($all_agents)) {
-        if ((count($all_modules) / count($all_agents)) >= 200) {
-            $system_higher = true;
+if (isset($id_agente)) {
+    $system_higher = false;
+    $modules_agent = db_get_all_rows_sql(sprintf('SELECT id_agente FROM tagente_modulo WHERE id_agente = %s', $id_agente));
+    if (is_array($modules_agent)) {
+        $all_modules = db_get_all_rows_sql('SELECT id_agente FROM tagente_modulo');
+        $all_agents = db_get_all_rows_sql('SELECT id_agente FROM tagente');
+        if (is_array($all_modules) && is_array($all_agents)) {
+            if ((count($all_modules) / count($all_agents)) >= 200) {
+                $system_higher = true;
+            }
         }
     }
-}
 
-echo '<div id="system_higher" class="invisible_important agent_details_agent_data flex_important"><img src="images/alert-yellow@svg.svg" width="10%" class="mrgn_right_20px">'.__('Your system has a much higher rate of modules per agent than recommended (200 modules per agent). This implies performance problems in the system, please consider reducing the number of modules in this agent.').'</div>';
+    echo '<div id="system_higher" class="invisible_important agent_details_agent_data flex_important"><img src="images/alert-yellow@svg.svg" width="10%" class="mrgn_right_20px">'.__('Your system has a much higher rate of modules per agent than recommended (200 modules per agent). This implies performance problems in the system, please consider reducing the number of modules in this agent.').'</div>';
+}
 
 ?>
 

From 65385f36c18eb24ac62613350ffdc19304e712b4 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 26 Jan 2024 09:18:47 +0100
Subject: [PATCH 57/62] fix visual errors in widgets dashboard
 pandora_enterprise#12267

---
 pandora_console/include/functions_ui.php         |  6 +++---
 .../lib/Dashboard/Widgets/ModulesByStatus.php    |  4 ++--
 pandora_console/include/styles/dashboards.css    | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d6078c56a7..0062b52e70 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4257,15 +4257,15 @@ function ui_print_datatable(array $parameters)
     // * END JAVASCRIPT.
     $info_msg_arr = [];
     $info_msg_arr['message'] = $emptyTable;
-    $info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-msg-info-'.$table_id;
+    $info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-info-massage datatable-msg-info-'.$table_id;
 
     $info_msg_arr_filter = [];
     $info_msg_arr_filter['message'] = __('Please apply a filter to display the data.');
-    $info_msg_arr_filter['div_class'] = 'info_box_container invisible_important datatable-msg-info-filter-'.$table_id;
+    $info_msg_arr_filter['div_class'] = 'info_box_container invisible_important datatable-info-massage datatable-msg-info-filter-'.$table_id;
 
     $spinner = '<div id="'.$table_id.'-spinner" class="invisible spinner-fixed"><span></span><span></span><span></span><span></span></div>';
 
-    $info_msg = '<div>'.ui_print_info_message($info_msg_arr, '', true).'</div>';
+    $info_msg = '<div class="datatable-container-info-massage">'.ui_print_info_message($info_msg_arr, '', true).'</div>';
 
     $info_msg_filter = '<div>'.ui_print_info_message($info_msg_arr_filter, true).'</div>';
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index 86a6cde7ed..69c0a36f44 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -521,7 +521,7 @@ class ModulesByStatus extends Widget
                 'server_name',
                 [
                     'text'  => 'last_status_change',
-                    'class' => 'flex-column',
+                    'class' => '',
                 ],
                 'estado',
             ];
@@ -538,7 +538,7 @@ class ModulesByStatus extends Widget
                 'alias',
                 [
                     'text'  => 'last_status_change',
-                    'class' => 'flex-column',
+                    'class' => '',
                 ],
                 'estado',
             ];
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index 8786faa843..00a780be6d 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -977,3 +977,19 @@ input.resize_button {
 .event-cardboard-widget td {
   cursor: pointer;
 }
+
+.datatable-container-info-massage:not(:has(.invisible_important)) {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+}
+
+.info_box_information.datatable-info-massage.info_box_container
+  .info_box.info.textodialogo {
+  display: flex;
+  width: 100%;
+  justify-content: center;
+}

From bba32495a4f8518f92e8e1fa7f4d69f5120ede03 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 26 Jan 2024 10:15:01 +0100
Subject: [PATCH 58/62] fix visual errors in msg umc offline
 pandora_enterprise#12399

---
 .../resources/javascript/umc_offline.js               | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pandora_console/update_manager_client/resources/javascript/umc_offline.js b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
index ad2432a306..11e397d996 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc_offline.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
@@ -428,11 +428,14 @@ function install_package(url, auth, packageId, version, serverUpdate) {
 
           var response = d.result;
           document.getElementById("log_zone").innerText = response.result;
-          $("#input-progress")
-            .val(100)
-            .change();
+          if (response.error == undefined || response.error == "") {
+            $("#input-progress")
+              .val(100)
+              .change();
+
+            $("#result li").removeClass("error");
+          }
 
-          $("#result li").removeClass("error");
           $("#result li")
             .find("p")
             .text(response.result);

From 139b92441032d69bed35199f7e5a817997113841 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Fri, 26 Jan 2024 14:01:32 +0100
Subject: [PATCH 59/62] #12681 added decimals in module windows

---
 pandora_agents/unix/pandora_agent           | 2 +-
 pandora_agents/win32/windows/pandora_wmi.cc | 6 +++---
 pandora_agents/win32/windows/pandora_wmi.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 956fb984d8..4ec522db43 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -3132,7 +3132,7 @@ sub module_freepercentdisk ($) {
 
 	return () unless defined ($Parts{$module->{'params'}}) and defined ($Parts{$module->{'params'}}{'avail'});
 	
-	my $availp = sprintf("%.2f", $Parts{$module->{'params'}}{'avail'} * 100 / $Parts{$module->{'params'}}{'total'});
+	my $availp = sprintf("%d", $Parts{$module->{'params'}}{'avail'} * 100 / $Parts{$module->{'params'}}{'total'});
 	return ($availp);
 }
 
diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc
index 7bf1091602..5e382232ae 100644
--- a/pandora_agents/win32/windows/pandora_wmi.cc
+++ b/pandora_agents/win32/windows/pandora_wmi.cc
@@ -188,7 +188,7 @@ Pandora_Wmi::getDiskFreeSpace (string disk_id) {
  * @exception Pandora_Wmi_Exception Throwd if an error occured when reading
  *            from WMI database.
  */
-unsigned long
+double
 Pandora_Wmi::getDiskFreeSpacePercent (string disk_id) {
 	CDhInitialize      init;
 	CDispPtr           wmi_svc, quickfixes;
@@ -202,7 +202,7 @@ Pandora_Wmi::getDiskFreeSpacePercent (string disk_id) {
 		dhCheck (dhGetValue (L"%o", &quickfixes, wmi_svc,
 				     L".ExecQuery(%T)",
 				     query.c_str ()));
-	
+
 		FOR_EACH (quickfix, quickfixes, NULL) {
 			dhGetValue (L"%e", &free_space, quickfix,
 				    L".FreeSpace");
@@ -213,7 +213,7 @@ Pandora_Wmi::getDiskFreeSpacePercent (string disk_id) {
 				return 0;
 			}
 
-			return (unsigned long) (free_space * 100 / size);
+			return (free_space * 100 / size);
 		} NEXT_THROW (quickfix);
 	} catch (string errstr) {
 		pandoraLog ("getDiskFreeSpace error. %s", errstr.c_str ());
diff --git a/pandora_agents/win32/windows/pandora_wmi.h b/pandora_agents/win32/windows/pandora_wmi.h
index 5eeb5d6a90..857b228471 100644
--- a/pandora_agents/win32/windows/pandora_wmi.h
+++ b/pandora_agents/win32/windows/pandora_wmi.h
@@ -44,7 +44,7 @@ namespace Pandora_Wmi {
 	int           isProcessRunning      (string process_name);
 	int           isServiceRunning      (string service_name);
 	unsigned long getDiskFreeSpace      (string disk_id);
-	unsigned long getDiskFreeSpacePercent      (string disk_id);
+	double        getDiskFreeSpacePercent      (string disk_id);
 	int           getCpuUsagePercentage (int cpu_id);
 	long          getFreememory         ();
 	long          getFreememoryPercent  ();

From babb7bce3895bb955bb752a27176b2376d293dd9 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Fri, 26 Jan 2024 15:06:09 +0100
Subject: [PATCH 60/62] #12681 fixed double number parse

---
 pandora_agents/win32/modules/pandora_module_freedisk_percent.cc | 2 +-
 pandora_agents/win32/windows/pandora_wmi.cc                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc b/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
index c061d4394b..d117b0feca 100755
--- a/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
+++ b/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
@@ -59,7 +59,7 @@ Pandora_Module_Freedisk_Percent::run () {
 	try {
 		res = Pandora_Wmi::getDiskFreeSpacePercent (this->disk_id);
 			
-		this->setOutput (longtostr (res));
+		this->setOutput (res);
 	} catch (Pandora_Wmi::Pandora_Wmi_Exception e) {
 		this->has_output = false;
 	}
diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc
index 5e382232ae..d0b3f5dc30 100644
--- a/pandora_agents/win32/windows/pandora_wmi.cc
+++ b/pandora_agents/win32/windows/pandora_wmi.cc
@@ -192,7 +192,7 @@ double
 Pandora_Wmi::getDiskFreeSpacePercent (string disk_id) {
 	CDhInitialize      init;
 	CDispPtr           wmi_svc, quickfixes;
-	double      free_space = 0, size = 0;
+	double             free_space = 0, size = 0;
 	string             query;
 
 	query = "SELECT Size, FreeSpace FROM Win32_LogicalDisk WHERE DeviceID = \"" + disk_id + "\"";

From 1b9cd2d36cd225e01a447947ffa1495d2ec97730 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Fri, 26 Jan 2024 15:26:29 +0100
Subject: [PATCH 61/62] #12681 fixed double parse

---
 pandora_agents/win32/modules/pandora_module_freedisk_percent.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc b/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
index d117b0feca..032810dfc4 100755
--- a/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
+++ b/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
@@ -59,7 +59,7 @@ Pandora_Module_Freedisk_Percent::run () {
 	try {
 		res = Pandora_Wmi::getDiskFreeSpacePercent (this->disk_id);
 			
-		this->setOutput (res);
+        this->setOutput(std::to_string(res));
 	} catch (Pandora_Wmi::Pandora_Wmi_Exception e) {
 		this->has_output = false;
 	}

From b8973ecab49cea55d1bb117d549a8888b610d02b Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 29 Jan 2024 09:04:03 +0100
Subject: [PATCH 62/62] #12681 fixed decimals in module freepercent

---
 pandora_agents/win32/modules/pandora_module_freedisk_percent.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc b/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
index 032810dfc4..bda0043b0d 100755
--- a/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
+++ b/pandora_agents/win32/modules/pandora_module_freedisk_percent.cc
@@ -48,7 +48,7 @@ Pandora_Module_Freedisk_Percent::Pandora_Module_Freedisk_Percent (string name, s
 
 void
 Pandora_Module_Freedisk_Percent::run () {
-	long res;
+	double res;
 
 	try {
 		Pandora_Module::run ();