diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b22228154f..25811ce4d6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2010-05-03 Sergio Martin + + * operation/agentes/alerts_status.php + operation/agentes/alerts_status.functions.php: Fixed + typo fix for bug: 2989944 + 2010-05-03 Sergio Martin * operation/events/events.php: Fixed the successfully diff --git a/pandora_console/operation/agentes/alerts_status.functions.php b/pandora_console/operation/agentes/alerts_status.functions.php index 8d73e82cb8..c2b7f9f130 100755 --- a/pandora_console/operation/agentes/alerts_status.functions.php +++ b/pandora_console/operation/agentes/alerts_status.functions.php @@ -29,7 +29,7 @@ function validateAlert() { require_once ("include/functions_alerts.php"); $result1 = validate_alert_agent_module ($ids); $result2 = validate_alert_compound ($compound_ids); - $result == $result1 || $result2; + $result = $result1 || $result2; print_result_message ($result, __('Alert(s) validated'), @@ -65,4 +65,4 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url) { print_table ($table); echo ''; } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 0aacd918d0..3f710ae2dc 100644 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -44,9 +44,6 @@ $url = 'index.php?sec='.$sec.'&sec2='.$sec2.'&refr='.$config["refr"].'&filter='. if ($flag_alert == 1 && give_acl($config['id_user'], $id_group, "AW")) { forceExecution($id_group); } -if ($alert_validate) { - validateAlert(); -} $idAgent = get_parameter_get('id_agente', 0); @@ -84,6 +81,10 @@ else { print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation"); } +if ($alert_validate) { + validateAlert(); +} + if ($free_search != '') { $whereAlertSimple = 'AND (' . 'id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE "%' . $free_search . '%") OR ' .