diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index 762bc1a7aa..6c100d9003 100644 --- a/pandora_console/include/functions_alerts.php +++ b/pandora_console/include/functions_alerts.php @@ -155,9 +155,14 @@ function alerts_get_event_status_group($idGroup, $type = "alert_fired", $query = $agents = agents_get_group_agents($idGroup, false, "lower", false); $idAgents = array_keys($agents); + } else { $idAgents = array_values($agents); + + if($type=='alert_fired'){ + $idAgents = array_keys($agents); + } } $result = db_get_all_rows_sql('SELECT id_evento diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 970af04592..e272258eda 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -429,7 +429,7 @@ function html_print_select_groups($id_user = false, $privilege = "AR", function html_print_select ($fields, $name, $selected = '', $script = '', $nothing = '', $nothing_value = 0, $return = false, $multiple = false, $sort = true, $class = '', $disabled = false, $style = false, - $option_style = false, $size = false,$modal=false,$message=''){ + $option_style = false, $size = false,$modal=false,$message='',$select_all=false){ $output = "\n"; @@ -513,7 +513,12 @@ function html_print_select ($fields, $name, $selected = '', $script = '', $optlabel = $label['name']; } - $output .= '