tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7302-bug-en-macro-moduledata-x' into 'develop'

Browse Source 
Fixed encoding ampersand on mail alerts

See merge request artica/pandorafms!4035
This commit is contained in:
Daniel Rodriguez 2021-05-11 09:44:15 +00:00
commit fc4d3b7d23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1339,6 +1339,9 @@ sub pandora_execute_action ($$$$$$$$$;$) {
my $cid_data = "CID_IMAGE"; my $cid_data = "CID_IMAGE";
my $dataname = "CID_IMAGE.png"; my $dataname = "CID_IMAGE.png";
# Decode ampersand. Used for macros with encoded names.
$field3 =~ s/&/&/g;
if (defined($data) && $data =~ /^data:image\/png;base64, /) { if (defined($data) && $data =~ /^data:image\/png;base64, /) {
# macro _data_ substitution in case is image. # macro _data_ substitution in case is image.
$attach_data_as_image = 1; $attach_data_as_image = 1;