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: Decode HTML entities for all alert types.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1909 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2009-09-02 15:54:53 +00:00
parent 3d9e3389c1
commit e5380d5a4c
2 changed files with 10 additions and 2 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 @@
2009-09-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Decode HTML entities for all alert types.
2009-09-02 Ramon Novoa <rnovoa@artica.es> 2009-09-02 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: HTML entities in alert fields are properly * lib/PandoraFMS/Core.pm: HTML entities in alert fields are properly

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

@ -423,6 +423,10 @@ sub pandora_execute_action ($$$$$$$) {
$field3 = $alert->{'field3_recovery'} ne "" ? $alert->{'field3_recovery'} : "[RECOVER]" . $field3; $field3 = $alert->{'field3_recovery'} ne "" ? $alert->{'field3_recovery'} : "[RECOVER]" . $field3;
} }
$field1 = decode_entities ($field1);
$field2 = decode_entities ($field2);
$field3 = decode_entities ($field3);
# Alert macros # Alert macros
my %macros = (_field1_ => $field1, my %macros = (_field1_ => $field1,
_field2_ => $field2, _field2_ => $field2,
@ -459,8 +463,8 @@ sub pandora_execute_action ($$$$$$$) {
# Email # Email
} elsif ($action->{'name'} eq "eMail") { } elsif ($action->{'name'} eq "eMail") {
$field2 = decode_entities (subst_alert_macros ($field2, \%macros)); $field2 = subst_alert_macros ($field2, \%macros);
$field3 = decode_entities (subst_alert_macros ($field3, \%macros)); $field3 = subst_alert_macros ($field3, \%macros);
foreach my $address (split (',', $field1)) { foreach my $address (split (',', $field1)) {
# Remove blanks # Remove blanks
$address =~ s/ +//g; $address =~ s/ +//g;