tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
alejandro.campos@artica.es 2021-06-02 19:02:25 +02:00
parent 84905a6579
commit 36eb084824
2 changed files with 5 additions and 5 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

@ -3144,7 +3144,7 @@ $class = 'databox filters';
'agent_os_filter[]', 'agent_os_filter[]',
$selected_agent_os_filter, $selected_agent_os_filter,
'', '',
'All', __('All'),
'0', '0',
false, false,
true true
@ -3198,8 +3198,8 @@ $class = 'databox filters';
'agent_status_filter[]', 'agent_status_filter[]',
$selected_agent_status_filter, $selected_agent_status_filter,
'', '',
false, __('All'),
'', '-1',
false, false,
true, true,
false, false,

4
pandora_console/include/functions_reporting.php
View File

@ -2297,7 +2297,7 @@ function reporting_agents_inventory($report, $content)
$search_sql .= ' AND id_os = '.$es_custom_fields; $search_sql .= ' AND id_os = '.$es_custom_fields;
} }
if ($es_os_filter != '') { if (in_array('0', $es_os_filter) === false) {
$search_sql .= ' AND id_os IN ('.implode(',', $es_os_filter).')'; $search_sql .= ' AND id_os IN ('.implode(',', $es_os_filter).')';
} }
@ -2394,7 +2394,7 @@ function reporting_agents_inventory($report, $content)
} }
if (array_search('estado', $es_agents_inventory_display_options) !== false) { if (array_search('estado', $es_agents_inventory_display_options) !== false) {
if (in_array(agents_get_status($value['id_agente']), $es_agent_status_filter)) { if (in_array('-1', $es_agent_status_filter) === true || in_array(agents_get_status($value['id_agente']), $es_agent_status_filter)) {
$agents[$key]['estado'] = agents_get_status($value['id_agente']); $agents[$key]['estado'] = agents_get_status($value['id_agente']);
} else { } else {
// Agent does not match status filter. // Agent does not match status filter.