From 40dfca0ea67d92f4a123aca5d45c7614f85cb2a7 Mon Sep 17 00:00:00 2001
From: miguel angel rasteu <miguelangel.rasteu@pandorafms.com>
Date: Fri, 16 Jun 2023 11:19:56 +0200
Subject: [PATCH] #11560 Fix reporting inventory

---
 .../godmode/reporting/reporting_builder.item_editor.php     | 6 ++++--
 pandora_console/godmode/reporting/reporting_builder.php     | 4 ++++
 pandora_console/include/functions_inventory.php             | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 7ec49b4d08..ca36389809 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1219,7 +1219,7 @@ $class = 'databox filters';
                 <?php
                 html_print_select(
                     $servers,
-                    'combo_server_sql',
+                    'combo_server',
                     $server_name,
                     ''
                 );
@@ -1240,7 +1240,7 @@ $class = 'databox filters';
                 <?php
                 html_print_select(
                     $servers_all_opt,
-                    'combo_server',
+                    'combo_server_sql',
                     $server_name,
                     '',
                     $nothing,
@@ -7193,6 +7193,8 @@ function chooseType() {
                 );
             });
 
+            $("#combo_server").trigger('change');
+
             $("#combo_group").change(function() {
                 $('#hidden-date_selected').val('');
                 updateInventoryDates(
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 1c3a88e73d..a16be36649 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1757,6 +1757,10 @@ switch ($action) {
                                     'inventory_modules'
                                 );
                                 $es['inventory_regular_expression'] = get_parameter('inventory_regular_expression', '');
+                                if (is_metaconsole() === true) {
+                                    $es['inventory_server'] = get_parameter('combo_server');
+                                }
+
                                 $description = get_parameter('description');
                                 $values['external_source'] = json_encode($es);
                                 $good_format = true;
diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php
index 3e1aa3b9d0..c710eb69f3 100644
--- a/pandora_console/include/functions_inventory.php
+++ b/pandora_console/include/functions_inventory.php
@@ -63,7 +63,12 @@ function inventory_get_data(
         array_push($where, 'id_agente IN ('.implode(',', $agents_ids).')');
     }
 
+    foreach ($inventory_module_name as $key => $module_name) {
+        $inventory_module_name[$key] = io_safe_output($module_name);
+    }
+
     if ($inventory_module_name[0] !== '0'
+        && $inventory_module_name[0] !== 0
         && $inventory_module_name !== ''
         && $inventory_module_name !== 'all'
     ) {