tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#11560 Fix reporting inventory

This commit is contained in:
miguel angel rasteu 2023-06-16 11:19:56 +02:00
parent d0998432df
commit 40dfca0ea6
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -1219,7 +1219,7 @@ $class = 'databox filters';
<?php <?php
html_print_select( html_print_select(
$servers, $servers,
'combo_server_sql', 'combo_server',
$server_name, $server_name,
'' ''
); );
@ -1240,7 +1240,7 @@ $class = 'databox filters';
<?php <?php
html_print_select( html_print_select(
$servers_all_opt, $servers_all_opt,
'combo_server', 'combo_server_sql',
$server_name, $server_name,
'', '',
$nothing, $nothing,
@ -7193,6 +7193,8 @@ function chooseType() {
); );
}); });
$("#combo_server").trigger('change');
$("#combo_group").change(function() { $("#combo_group").change(function() {
$('#hidden-date_selected').val(''); $('#hidden-date_selected').val('');
updateInventoryDates( updateInventoryDates(

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1757,6 +1757,10 @@ switch ($action) {
'inventory_modules' 'inventory_modules'
); );
$es['inventory_regular_expression'] = get_parameter('inventory_regular_expression', ''); $es['inventory_regular_expression'] = get_parameter('inventory_regular_expression', '');
if (is_metaconsole() === true) {
$es['inventory_server'] = get_parameter('combo_server');
}
$description = get_parameter('description'); $description = get_parameter('description');
$values['external_source'] = json_encode($es); $values['external_source'] = json_encode($es);
$good_format = true; $good_format = true;

5
pandora_console/include/functions_inventory.php
View File

@ -63,7 +63,12 @@ function inventory_get_data(
array_push($where, 'id_agente IN ('.implode(',', $agents_ids).')'); 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' if ($inventory_module_name[0] !== '0'
&& $inventory_module_name[0] !== 0
&& $inventory_module_name !== '' && $inventory_module_name !== ''
&& $inventory_module_name !== 'all' && $inventory_module_name !== 'all'
) { ) {