X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-sendbasket.pl;h=da74745f2e17dbf65370a33660c811b1e57b2fe4;hb=e9766f609471c2638824e2de2b2ea382d85cc4e8;hp=7787217683acea8bf0454cd29afa09224c7523d4;hpb=b93e6df3a1b7051bc92220cf6bd829c2229bfa70;p=koha.git

diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index 7787217683..da74745f2e 100755
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -27,7 +27,6 @@ use Carp;
 use Mail::Sendmail;
 use MIME::QuotedPrint;
 use MIME::Base64;
-use HTML::FormatText;
 use C4::Biblio;
 use C4::Items;
 use C4::Auth;
@@ -54,11 +53,20 @@ my $email_sender = $query->param('email_sender');
 my $dbh          = C4::Context->dbh;
 
 if ( $email_add ) {
+    my $user = GetMember(borrowernumber => $borrowernumber);
+    my $user_email = GetFirstValidEmailAddress($borrowernumber)
+    || C4::Context->preference('KohaAdminEmailAddress');
+
     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
+    my $email_replyto = "$user->{firstname} $user->{surname} <$user_email>";
     my $comment    = $query->param('comment');
     my %mail = (
         To   => $email_add,
-        From => $email_from
+        From => $email_from,
+    'Reply-To' => $email_replyto,
+#    'X-Orig-IP' => $ENV{'REMOTE_ADDR'},
+#    FIXME Commented out for now: discussion on privacy issue
+    'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress'),
     );
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
@@ -66,7 +74,7 @@ if ( $email_add ) {
             template_name   => "opac-sendbasket.tmpl",
             query           => $query,
             type            => "opac",
-            authnotrequired => 1,
+            authnotrequired => 0,
             flagsrequired   => { borrow => 1 },
         }
     );
@@ -106,8 +114,6 @@ if ( $email_add ) {
 
     my $resultsarray = \@results;
     
-    my $user = GetMember(borrowernumber => $borrowernumber); 
-    
     $template2->param(
         BIBLIO_RESULTS => $resultsarray,
         email_sender   => $email_sender,
@@ -128,7 +134,7 @@ if ( $email_add ) {
 
     my $email_header = "";
     if ( $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s ) {
-        $email_header = $1;
+        $email_header = encode_qp($1);
     }
 
     my $email_file = "basket.txt";
@@ -137,7 +143,7 @@ if ( $email_add ) {
     }
 
     if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) {
-        $body = $1;
+        $body = encode_qp($1);
     }
 
     my $boundary = "====" . time() . "====";
@@ -162,14 +168,15 @@ $isofile
 $boundary--
 END_OF_BODY
 
-    # Sending mail
-    if ( sendmail %mail ) {
-        # do something if it works....
+    # Sending mail (if not empty basket)
+    if ( defined($iso2709) && sendmail %mail ) {
+    # do something if it works....
         $template->param( SENT      => "1" );
     }
     else {
         # do something if it doesnt work....
-        carp "Error sending mail: $Mail::Sendmail::error \n";
+    carp "Error sending mail: empty basket" if !defined($iso2709);
+        carp "Error sending mail: $Mail::Sendmail::error" if $Mail::Sendmail::error;
         $template->param( error => 1 );
     }
     $template->param( email_add => $email_add );