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

2009-09-02 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: HTML entities in alert fields are properly
          decoded. Alert emails can be sent to multiple comma separated
          addresses.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1907 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2009-09-02 14:54:04 +00:00
parent 401984f734
commit 5f408629bd
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2009-09-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: HTML entities in alert fields are properly
decoded. Alert emails can be sent to multiple comma separated
addresses.
2009-09-02 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/PluginServer.pm, util/pandora_exec: Nagis plugin

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

@ -459,9 +459,13 @@ sub pandora_execute_action ($$$$$$$) {
# Email
} elsif ($action->{'name'} eq "eMail") {
$field2 = subst_alert_macros ($field2, \%macros);
$field3 = subst_alert_macros ($field3, \%macros);
pandora_sendmail ($pa_config, $field1, $field2, $field3);
$field2 = decode_entities (subst_alert_macros ($field2, \%macros));
$field3 = decode_entities (subst_alert_macros ($field3, \%macros));
foreach my $address (split (',', $field1)) {
# Remove blanks
$address =~ s/ +//g;
pandora_sendmail ($pa_config, $address, $field2, $field3);
}
# Internal event
} elsif ($action->{'name'} eq "Pandora FMS Event") {