From 8b7d5c81bc0c15aecc01b8577e5ae5c49b35a5d0 Mon Sep 17 00:00:00 2001 From: vgilc Date: Tue, 28 Feb 2012 14:17:53 +0000 Subject: [PATCH] 2012-02-28 Vanessa Gil * bin/PandoraFMS/Core.pm: Fixed bug: double safe_input in event name. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5663 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 4 ++++ pandora_server/lib/PandoraFMS/Core.pm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index bfb52a0652..04644fc64c 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2012-02-28 Vanessa Gil + + * bin/PandoraFMS/Core.pm: Fixed bug: double safe_input in event name. + 2012-02-20 Koichiro Kikuchi * lib/PandoraFMS/SNMPServer.pm: Parse source field to obtain source diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index fb2bbf2c93..88dc01f785 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -699,7 +699,7 @@ sub pandora_execute_alert ($$$$$$$$;$) { # Generate an event my ($text, $event) = ($alert_mode == 0) ? ('recovered', 'alert_recovered') : ('fired', 'alert_fired'); - pandora_event ($pa_config, "Alert $text (" . $alert->{'name'} . ") " . (defined ($module) ? 'assigned to ('. $module->{'nombre'} . ")" : ""), + pandora_event ($pa_config, "Alert $text (" . $alert->{'name'} . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""), (defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $alert->{'priority'}, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0), (defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh); }