From e2297171cb3f1ba2cf371cc1b4aef83fda080277 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Fri, 10 Mar 2023 15:14:43 +0100
Subject: [PATCH 1/2] Process inventory modules with correct xml and empty data

---
 pandora_console/include/functions_inventory.php       | 6 ++----
 pandora_console/operation/agentes/agent_inventory.php | 4 ++--
 pandora_console/operation/agentes/ver_agente.php      | 4 ----
 pandora_server/lib/PandoraFMS/Core.pm                 | 3 +--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php
index 050f37fe0a..30fdb5d4cd 100644
--- a/pandora_console/include/functions_inventory.php
+++ b/pandora_console/include/functions_inventory.php
@@ -756,10 +756,8 @@ function inventory_get_datatable(
         foreach ($rows as $row) {
             $data_rows = explode(PHP_EOL, $row['data']);
             foreach ($data_rows as $data_key => $data_value) {
-                if (empty($data_value) === false) {
-                    $row['data'] = $data_value;
-                    $modules[$row['name']][$row['name_agent'].'-'.$data_key.'-'.$data_value] = $row;
-                }
+                $row['data'] = $data_value;
+                $modules[$row['name']][$row['name_agent'].'-'.$data_key.'-'.$data_value] = $row;
             }
         }
 
diff --git a/pandora_console/operation/agentes/agent_inventory.php b/pandora_console/operation/agentes/agent_inventory.php
index e1ba0a7d88..88c825d0f8 100644
--- a/pandora_console/operation/agentes/agent_inventory.php
+++ b/pandora_console/operation/agentes/agent_inventory.php
@@ -169,7 +169,7 @@ foreach ($rows as $row) {
     }
 
     if ($idModuleInventory != $row['id_module_inventory']) {
-        if (isset($table) === true && $rowTable > 1) {
+        if (isset($table) === true && $rowTable >= 1) {
             html_print_table($table);
             unset($table);
             $rowTable = 1;
@@ -271,7 +271,7 @@ foreach ($rows as $row) {
     $idModuleInventory = $row['id_module_inventory'];
 }
 
-if (isset($table) === true && $rowTable > 1) {
+if (isset($table) === true && $rowTable >= 1) {
     html_print_table($table);
     $printedTables++;
 }
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index d75cb39568..ad7977c9f4 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1457,10 +1457,6 @@ if ($tab == 'inventory') {
     $inventorytab['active'] = false;
 }
 
-$inventorytab = enterprise_hook('inventory_tab');
-if ($inventorytab === ENTERPRISE_NOT_HOOK || $inventoryCount === 0) {
-    $inventorytab = '';
-}
 
 // Collection.
 if ((int) $config['license_nms'] !== 1) {
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 04fd172019..a7c835a3f2 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -7231,8 +7231,7 @@ sub process_inventory_data ($$$$$$$) {
 					$data_list .= $data . "\n";
 				}
 			}
-			
-			next if ($data_list eq '');
+
 			process_inventory_module_data ($pa_config, $data_list, $server_id, $agent_name, $module_name, $interval, $timestamp, $dbh);
 		}
 	}

From 9e20ce3ec7dd67664145b87019a57b62ce5d537f Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Mon, 3 Apr 2023 17:09:54 +0200
Subject: [PATCH 2/2] Fix empty inventory module showing hash

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

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 5693d21643..bcb4ae3cc7 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -7269,8 +7269,11 @@ sub process_inventory_data ($$$$$$$) {
 				
 				# Empty list
 				next unless defined ($list->{'data'});
-				
+			
 				foreach my $data (@{$list->{'data'}}) {
+					#Empty data.
+					next if (ref($data) eq 'HASH');
+					
 					$data_list .= $data . "\n";
 				}
 			}