use Mail::Sendmail;
use MIME::QuotedPrint;
use MIME::Base64;
-use HTML::FormatText;
use C4::Biblio;
use C4::Items;
use C4::Auth;
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(
template_name => "opac-sendbasket.tmpl",
query => $query,
type => "opac",
- authnotrequired => 1,
+ authnotrequired => 0,
flagsrequired => { borrow => 1 },
}
);
my $resultsarray = \@results;
- my $user = GetMember(borrowernumber => $borrowernumber);
-
$template2->param(
BIBLIO_RESULTS => $resultsarray,
email_sender => $email_sender,
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";
}
if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) {
- $body = $1;
+ $body = encode_qp($1);
}
my $boundary = "====" . time() . "====";
$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 );