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 <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
use C4::Output;
use C4::Biblio;
use C4::Members;
use C4::Output;
use C4::Biblio;
use C4::Members;
my $dbh = C4::Context->dbh;
if ( $email_add ) {
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 $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 $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(
{
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
{