From 189404cff4ea7c8244a8022f75775a63551bee1e Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 1 Mar 2011 04:32:56 +0000 Subject: [PATCH] Escape email headers to allow more than ASCII 7-bit content git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_1@1249 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- tools/email_notices_french.sql | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/email_notices_french.sql b/tools/email_notices_french.sql index b2886b974b..87121ed65f 100644 --- a/tools/email_notices_french.sql +++ b/tools/email_notices_french.sql @@ -24,8 +24,8 @@ BEGIN; UPDATE action_trigger.event_definition SET template = $$ [%- francais = 'true' -%] [%- END -%] [%- END -%] -To: [%- params.recipient_email || user.email %] -From: [%- target.0.target_copy.circ_lib.email || params.sender_email || default_sender %] +To: [%- helpers.escape_email_header(params.recipient_email || user.email) %] +From: [%- helpers.escape_email_header(target.0.target_copy.circ_lib.email || params.sender_email || default_sender) %] [% IF francais -%] Subject: Rappel (message automatique) @@ -67,8 +67,8 @@ BEGIN; UPDATE action_trigger.event_definition SET template = $$ [%- francais = 'true' -%] [%- END -%] [%- END -%] -To: [%- params.recipient_email || user.email %] -From: [%- target.0.target_copy.circ_lib.email || params.sender_email || default_sender %] +To: [%- helpers.escape_email_header(params.recipient_email || user.email) %] +From: [%- helpers.escape_email_header(target.0.target_copy.circ_lib.email || params.sender_email || default_sender) %] [% IF francais -%] Subject: Avis de retard (message automatique) @@ -118,10 +118,10 @@ BEGIN; UPDATE action_trigger.event_definition SET template = $$ [%- francais = 'true' -%] [%- END -%] [%- END -%] -To: [%- params.recipient_email || user.email %] -From: [%- params.sender_email || user.home_ou.email || default_sender %] +To: [%- helpers.escape_email_header(params.recipient_email || user.email) %] +From: [%- helpers.escape_email_header(params.sender_email || user.home_ou.email || default_sender) %] [% IF francais -%] -Subject: [% user.home_ou.name %] : votre mot de passe du système de la Bibliothèque +Subject: [% helpers.escape_email_header(user.home_ou.name . ' : votre mot de passe du système de la Bibliothèque') %] Vous avez reçu ce message parce vous, ou une autre personne, avez demandé de réinitialiser votre mot de passe du système de la Bibliothèque. Si vous n’avez -- 2.11.0