fix for #2884: Add error management to branches

[koha.git] / opac / opac-sendbasket.pl

diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index f959fbf..f17bb71 100755 (executable)
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -16,8 +16,10 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+
 use CGI;
+use Encode qw(encode);
+
 use Mail::Sendmail;
 use MIME::QuotedPrint;
 use MIME::Base64;
@@ -116,7 +118,7 @@ if ( $email_add ) {
         $email_file = $1;
     }
 
-    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = $1; }
+    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); }
 
     my $boundary = "====" . time() . "====";
 
@@ -129,13 +131,14 @@ if ( $email_add ) {
     #     # Writing mail
     #     $mail{body} =
     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
-    my $isofile = encode_base64($iso2709);
+    my $isofile = encode_base64(encode("UTF-8", $iso2709));
     $boundary = '--' . $boundary;
     $mail{body} = <<END_OF_BODY;
 $boundary
-Content-Type: text/plain; charset="iso-8859-1"
+Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: quoted-printable
 
+$email_header
 $body
 $boundary
 Content-Type: application/octet-stream; name="basket.iso2709"