Merge remote-tracking branch 'origin/new/bug_8062'

diff --combined opac/opac-sendbasket.pl
index a3a4eb8,25f4349..5b38a54
--- 1/opac/opac-sendbasket.pl
--- 2/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@@ -27,7 -27,6 +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,20 -53,11 +53,20 @@@ my $email_sender = $query->param('email
  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(
@@@ -75,7 -65,7 +74,7 @@@
              template_name   => "opac-sendbasket.tmpl",
              query           => $query,
              type            => "opac",
 -            authnotrequired => 1,
 +            authnotrequired => 0,
              flagsrequired   => { borrow => 1 },
          }
      );
@@@ -115,6 -105,8 +114,6 @@@
  
      my $resultsarray = \@results;
      
 -    my $user = GetMember(borrowernumber => $borrowernumber); 
 -    
      $template2->param(
          BIBLIO_RESULTS => $resultsarray,
          email_sender   => $email_sender,
@@@ -169,15 -161,14 +168,15 @@@ $isofil
  $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 );