Bug 11944: Fix encoding on sending emails

[koha.git] / virtualshelves / sendshelf.pl

diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index 16ada89..4649aa3 100755 (executable)
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -20,8 +20,8 @@
 use strict;
 use warnings;
 
-use CGI;
-use Encode qw(encode);
+use CGI qw ( -utf8 );
+use Encode qw( encode );
 use Carp;
 
 use Mail::Sendmail;
@@ -32,12 +32,13 @@ use C4::Biblio;
 use C4::Items;
 use C4::Output;
 use C4::VirtualShelves;
+use Koha::Email;
 
 my $query = new CGI;
 
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "virtualshelves/sendshelfform.tmpl",
+        template_name   => "virtualshelves/sendshelfform.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -48,59 +49,66 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
 my $shelfid = $query->param('shelfid');
 my $email   = $query->param('email');
 
-my $dbh          = C4::Context->dbh;
+my $dbh = C4::Context->dbh;
 
-if ( $email ) {
-    my $email_from = C4::Context->preference('KohaAdminEmailAddress');
-    my $comment    = $query->param('comment');
-
-    my %mail = (
-        To   => $email,
-        From => $email_from
+if ($email) {
+    my $comment = $query->param('comment');
+    my $message = Koha::Email->new();
+    my %mail    = $message->create_message_headers(
+        {
+            to => $email
+        }
     );
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
         {
-           template_name   => "virtualshelves/sendshelf.tmpl",
-           query           => $query,
-           type            => "intranet",
-           authnotrequired => 0,
-           flagsrequired   => { catalogue => 1 },
+        template_name   => "virtualshelves/sendshelf.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
         }
     );
 
-    my @shelf               = GetShelf($shelfid);
-    my ($items, $totitems)  = GetShelfContents($shelfid);
-    my $marcflavour         = C4::Context->preference('marcflavour');
+    my @shelf = GetShelf($shelfid);
+    my ( $items, $totitems ) = GetShelfContents($shelfid);
+    my $marcflavour = C4::Context->preference('marcflavour');
     my $iso2709;
     my @results;
 
     # retrieve biblios from shelf
     foreach my $biblio (@$items) {
-        my $biblionumber = $biblio->{biblionumber};
-
+        my $biblionumber     = $biblio->{biblionumber};
+        my $fw               = GetFrameworkCode($biblionumber);
         my $dat              = GetBiblioData($biblionumber);
         my $record           = GetMarcBiblio($biblionumber);
         my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
         my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
+        my $subtitle         = GetRecordValue( 'subtitle', $record, $fw );
 
-        my @items = GetItemsInfo( $biblionumber );
+        my @items = GetItemsInfo($biblionumber);
 
         $dat->{MARCNOTES}      = $marcnotesarray;
         $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{'biblionumber'} = $biblionumber;
         $dat->{ITEM_RESULTS}   = \@items;
+        $dat->{subtitle}       = $subtitle;
 
         $iso2709 .= $record->as_usmarc();
 
         push( @results, $dat );
     }
 
+    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],
     );
@@ -110,29 +118,37 @@ 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'} = Encode::encode("UTF-8", $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(Encode::encode("UTF-8", $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(Encode::encode("UTF-8", $body));
+    }
 
     my $boundary = "====" . time() . "====";
 
     # We set and put the multipart content
     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
 
-    my $isofile = encode_base64(encode("UTF-8", $iso2709));
+    my $isofile = encode_base64( encode( "UTF-8", $iso2709 ) );
     $boundary = '--' . $boundary;
 
     $mail{body} = <<END_OF_BODY;
@@ -153,8 +169,9 @@ END_OF_BODY
 
     # Sending mail
     if ( sendmail %mail ) {
+
         # do something if it works....
-        $template->param( SENT      => "1" );
+        $template->param( SENT => "1" );
     }
     else {
         # do something if it doesnt work....
@@ -165,10 +182,11 @@ END_OF_BODY
     $template->param( email => $email );
     output_html_with_http_headers $query, $cookie, $template->output;
 
-
-}else{
-    $template->param( shelfid => $shelfid,
-                      url     => "/cgi-bin/koha/virtualshelves/sendshelf.pl",
-                    );
+}
+else {
+    $template->param(
+        shelfid => $shelfid,
+        url     => "/cgi-bin/koha/virtualshelves/sendshelf.pl",
+    );
     output_html_with_http_headers $query, $cookie, $template->output;
 }