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 6e60bc9..b662664 100755 (executable)
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -21,7 +21,7 @@ use strict;
 use warnings;
 
 use CGI;
-use Encode qw(encode);
+use Encode qw(decode encode);
 use Carp;
 
 use Mail::Sendmail;
@@ -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,
@@ -91,12 +93,14 @@ if ( $email ) {
 
         my @items = GetItemsInfo( $biblionumber );
 
+        $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
         $dat->{MARCNOTES}      = $marcnotesarray;
         $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{'biblionumber'} = $biblionumber;
         $dat->{ITEM_RESULTS}   = \@items;
         $dat->{subtitle}       = $subtitle;
+        $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
 
         $iso2709 .= $record->as_usmarc();
 
@@ -105,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},
@@ -123,22 +123,30 @@ if ( $email ) {
     my $body;
 
     # Analysing information and getting mail properties
-    if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
-        $mail{'subject'} = $1;
+    if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
+        $mail{subject} = $1;
+        $mail{subject} =~ s|\n?(.*)\n?|$1|;
     }
     else { $mail{'subject'} = "no subject"; }
 
     my $email_header = "";
-    if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
+    if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
         $email_header = $1;
+        $email_header =~ s|\n?(.*)\n?|$1|;
+        $email_header = encode_qp($email_header);
     }
 
-    my $email_file = "basket.txt";
-    if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
+    my $email_file = "list.txt";
+    if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
         $email_file = $1;
+        $email_file =~ s|\n?(.*)\n?|$1|;
     }
 
-    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); }
+    if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
+        $body = $1;
+        $body =~ s|\n?(.*)\n?|$1|;
+        $body = encode_qp($body);
+    }
 
     my $boundary = "====" . time() . "====";
 
@@ -150,15 +158,16 @@ if ( $email ) {
 
     $mail{body} = <<END_OF_BODY;
 $boundary
+MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: quoted-printable
 
 $email_header
 $body
 $boundary
-Content-Type: application/octet-stream; name="shelf.iso2709"
+Content-Type: application/octet-stream; name="list.iso2709"
 Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="shelf.iso2709"
+Content-Disposition: attachment; filename="list.iso2709"
 
 $isofile
 $boundary--