Bug 13469 - Unapi path to XSLTs is wrong in OPAC

[srvgit] / opac / opac-sendshelf.pl

diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index 852ef8d..b662664 100755 (executable)
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -33,12 +33,13 @@ use C4::Items;
 use C4::Output;
 use C4::VirtualShelves;
 use C4::Members;
+use Koha::Email;
 
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-sendshelfform.tmpl",
+        template_name   => "opac-sendshelfform.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
@@ -54,17 +55,18 @@ 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(
         {
-            template_name   => "opac-sendshelf.tmpl",
+            template_name   => "opac-sendshelf.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
@@ -107,13 +109,9 @@ if ( $email ) {
 
     my $user = GetMember(borrowernumber => $borrowernumber);
 
-    if (C4::Context->preference('OPACBaseURL')){
-          $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
-    }
-
     $template2->param(
         BIBLIO_RESULTS => \@results,
-        email_sender   => $email_from,
+        email_sender   => $mail{'from'},
         comment        => $comment,
         shelfname      => $shelf[1],
         firstname      => $user->{firstname},