Bug 9530 making changes to opac/opac-sendshelf.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 list from the public (OPAC) interface
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>

diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index d2fdc82..b662664 100755 (executable)
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -33,6 +33,7 @@ use C4::Items;
 use C4::Output;
 use C4::VirtualShelves;
 use C4::Members;
+use Koha::Email;
 
 my $query = new CGI;
 
@@ -54,12 +55,13 @@ my $dbh          = C4::Context->dbh;
 if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) {
 
 if ( $email ) {
-    my $email_from = C4::Context->preference('KohaAdminEmailAddress');
+    my $message = Koha::Email->new();
     my $comment    = $query->param('comment');
 
-    my %mail = (
-        To   => $email,
-        From => $email_from
+    my %mail = $message->create_message_headers(
+        {
+            to => $email,
+        }
     );
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
@@ -109,7 +111,7 @@ if ( $email ) {
 
     $template2->param(
         BIBLIO_RESULTS => \@results,
-        email_sender   => $email_from,
+        email_sender   => $mail{'from'},
         comment        => $comment,
         shelfname      => $shelf[1],
         firstname      => $user->{firstname},