tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-02-29 Vanessa Gil <vanessa.gil@artica.es> 

* bin/PandoraFMS/Core.pm: Fixed bug: HTML entities in alert name.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5676 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-29 15:04:15 +00:00
parent d100f24635
commit 3b04126c54
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_server/ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-29 Vanessa Gil <vanessa.gil@artica.es>
* bin/PandoraFMS/Core.pm: Fixed bug: HTML entities in alert name.
2012-02-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* util/pandora_manage.pl: Modify call to function

2
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -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 ('. safe_output($module->{'nombre'}) . ")" : ""),
pandora_event ($pa_config, "Alert $text (" . safe_output($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);
}