From 1b53588375e98fe56dd982ca75d33d7e7f7d3ef5 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 4 Oct 2013 08:24:42 +0000 Subject: [PATCH] 2013-10-04 Sergio Martin * include/functions_alerts.php: Fixed group filter in alerts view for incident #218 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8850 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_alerts.php | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3dd78c3f24..0da6fa57ee 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-10-04 Sergio Martin + + * include/functions_alerts.php: Fixed group filter in + alerts view for incident #218 + 2013-10-03 Miguel de Dios * godmode/reporting/visual_console_builder.wizard.php: fixed the diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index 11ae8c9e12..8f6630d16d 100644 --- a/pandora_console/include/functions_alerts.php +++ b/pandora_console/include/functions_alerts.php @@ -1528,18 +1528,22 @@ function get_group_alerts($id_group, $filter = '', $options = false, global $config; - + $group_query = ''; + if (!empty($idGroup)) { + $group_query = ' AND id_grupo = ' . $idGroup; + } + if (is_array($filter)) { $disabled = $filter['disabled']; if (isset($filter['standby'])) { - $filter = ' AND talert_template_modules.standby = "'.$filter['standby'].'"'; + $filter = $group_query . ' AND talert_template_modules.standby = "'.$filter['standby'].'"'; } else { - $filter = ''; + $filter = $group_query; } } else { - $filter = ''; + $filter = $group_query; $disabled = $filter; } @@ -1640,8 +1644,6 @@ function get_group_alerts($id_group, $filter = '', $options = false, $selectText = 'COUNT(talert_template_modules.id) AS count'; } - - $sql = sprintf ("SELECT %s FROM talert_template_modules INNER JOIN tagente_modulo t2