From 8308fe957e12282cf4d80d77bddbcf22d753f34d Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 12 Aug 2014 10:19:14 +1200 Subject: [PATCH] [PASSED QA] Bug 9530 making changes to opac/opac-sendbasket.pl To Test 1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault) 2/ Optionally edit the branch the mail will be sent from, adding email addresses 3/ Send a cart from the public site (OPAC) 4/ Check that the mails have the correct From, Replyto and ReturnPath set The rules are If the values are set in the branch use that, else use the syspref Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize --- opac/opac-sendbasket.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index 3cd81b1..8143cca 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -33,6 +33,7 @@ use C4::Auth; use C4::Output; use C4::Biblio; use C4::Members; +use Koha::Email; my $query = new CGI; @@ -53,21 +54,20 @@ my $email_sender = $query->param('email_sender'); my $dbh = C4::Context->dbh; if ( $email_add ) { + my $email = Koha::Email->new(); my $user = GetMember(borrowernumber => $borrowernumber); my $user_email = GetFirstValidEmailAddress($borrowernumber) || C4::Context->preference('KohaAdminEmailAddress'); - my $email_from = C4::Context->preference('KohaAdminEmailAddress'); my $email_replyto = "$user->{firstname} $user->{surname} <$user_email>"; my $comment = $query->param('comment'); - my %mail = ( - To => $email_add, - From => $email_from, - 'Reply-To' => $email_replyto, -# 'X-Orig-IP' => $ENV{'REMOTE_ADDR'}, -# FIXME Commented out for now: discussion on privacy issue - 'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress'), - ); + + # if you want to use the KohaAdmin address as from, that is the default no need to set it + my %mail = $email->create_message_headers({ + to => $email_add, + replyto => $email_replyto, + }); + $mail{'X-Abuse-Report'} = C4::Context->preference('KohaAdminEmailAddress'); my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( { -- 1.7.10.4