From eaefa5daf65161c9f7c99ab1340bbc97075450e6 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Tue, 23 Jul 2013 23:24:11 +0200 Subject: [PATCH] Bug 10621: use correct from-address for subscription alert emails From-address and to-address were the same (patron's email) for subscription alerts. This patch changes 'from' the branch or kohaadminemailaddress To test - add a subscription in staff/serials in case you don't have any - enable patron notifications or the subscription - in the OPAC, subscribe to the serial - in staff/serial, receive an issue of the serial Before applying the patch, the email that is supposed to be sent has the patron's email as 'from' and 'to' (and is likely to fail). If you follow the steps after applying the patch, the email alert should have the 'from' address of the patron's branch or kohaadminemiladdress -- which should also work fine with the MTA/SMTP you have set up for messaging. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 61fa246ac06d637d50c8eed68244f0577ed34e4d) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 75b31bb5cf4a6269dedeb95be374b654fe4b5091) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 75b31bb5cf4a6269dedeb95be374b654fe4b5091) --- C4/Letters.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index fb2a6c694d..af55727fbf 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -284,6 +284,7 @@ sub SendAlerts { # warn "sending issues..."; my $userenv = C4::Context->userenv; + my $branchdetails = GetBranchDetail($_->{'branchcode'}); my $letter = GetPreparedLetter ( module => 'serial', letter_code => $letter_code, @@ -300,7 +301,7 @@ sub SendAlerts { # ... then send mail my %mail = ( To => $email, - From => $email, + From => $branchdetails->{'branchemail'} || C4::Context->preference("KohaAdminEmailAddress"), Subject => Encode::encode( "utf8", "" . $letter->{title} ), Message => Encode::encode( "utf8", "" . $letter->{content} ), 'Content-Type' => 'text/plain; charset="utf8"', -- 2.39.5