Commit 110af547 authored by sikeda's avatar sikeda
Browse files

[-bug] Virus alert could not show correct sender of original messages.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12277 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 7e0be4dd
......@@ -50,7 +50,7 @@ Note: Because binary files have to be encoded in less-efficient ASCII format bef
[% ELSIF status == '5.7.0' -%]
[%|loc%]***** V I R U S A L E R T *****[%END%]
[%|loc(virus_name,recipient,from)%]Our viruschecker found a virus named %1 in a message addressed to %2 and that seems to be yours (From: %3).[%END%]
[%|loc(virus_name,recipient,sender)%]Our viruschecker found a virus named %1 in a message addressed to %2 and that seems to be yours (From: %3).[%END%]
[%|loc%]We stopped delivery of this email.[%END%]
......
......@@ -2,7 +2,7 @@ Subject: [% FILTER qencode %][%|loc%]A virus in your email[%END%][%END%]
[%|loc%]***** V I R U S A L E R T *****[%END%]
[%|loc(virus_name,recipient,from)%]Our viruschecker found a virus named %1 in a message addressed to %2 and that seems to be yours (From: %3).[%END%]
[%|loc(virus_name,recipient,sender)%]Our viruschecker found a virus named %1 in a message addressed to %2 and that seems to be yours (From: %3).[%END%]
[%|loc%]We stopped delivery of this email.[%END%]
......
......@@ -793,6 +793,7 @@ sub process_message {
$sender,
{ 'virus_name' => $rc,
'recipient' => $list_address,
'sender' => $message->{sender},
'lang' => Conf::get_robot_conf($robot, 'lang'),
'auto_submitted' => 'auto-replied'
}
......@@ -803,7 +804,7 @@ sub process_message {
$message,
{ 'virus_name' => $rc,
'recipient' => $list_address,
'from' => $message->{sender}
'sender' => $message->{sender}
},
'5.7.0'
);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment