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

2010-11-16 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Decode HTML entities in macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3591 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-11-16 10:38:59 +00:00
parent 03b79ef9c5
commit 6d487db95f
2 changed files with 7 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 @@
2010-11-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Decode HTML entities in macros.
2010-11-11 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/tentacle_server: Fixed variable name of PID.

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

@ -1403,7 +1403,9 @@ sub subst_alert_macros ($$) {
my ($string, $macros) = @_;
while ((my $macro, my $value) = each (%{$macros})) {
$string =~ s/($macro)/$value/ig;
# Macro data may contain HTML entities
my $decoded_value = decode_entities ($value);
$string =~ s/($macro)/$decoded_value/ig;
}
return $string;