use CGI qw ( -utf8 );
use Encode qw(encode);
use Carp;
-use Mail::Sendmail;
-use MIME::QuotedPrint;
-use MIME::Base64;
+use Try::Tiny;
use C4::Biblio;
use C4::Items;
use Koha::Patrons;
use Koha::Token;
-my $query = new CGI;
+my $query = CGI->new;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
{
template_name => "opac-sendbasketform.tt",
query => $query,
type => "opac",
- authnotrequired => 0,
}
);
session_id => scalar $query->cookie('CGISESSID'),
token => scalar $query->param('csrf_token'),
});
- my $email = Koha::Email->new();
my $patron = Koha::Patrons->find( $borrowernumber );
- my $user_email = GetFirstValidEmailAddress($borrowernumber)
+ my $borcat = $patron ? $patron->categorycode : q{};
+ my $user_email = $patron->first_valid_email_address
|| C4::Context->preference('KohaAdminEmailAddress');
my $email_replyto = $patron->firstname . " " . $patron->surname . " <$user_email>";
my $comment = $query->param('comment');
- # if you want to use the KohaAdmin address as from, that is the default no need to set it
- my %mail = $email->create_message_headers({
- to => $email_add,
- replyto => $email_replyto,
- });
- $mail{'X-Abuse-Report'} = C4::Context->preference('KohaAdminEmailAddress');
-
# Since we are already logged in, no need to check credentials again
# when loading a second template.
my $template2 = C4::Templates::gettemplate(
my $dat = GetBiblioData($biblionumber);
next unless $dat;
- my $record = GetMarcBiblio($biblionumber, 1);
+ my $record = GetMarcBiblio({
+ biblionumber => $biblionumber,
+ embed_items => 1,
+ opac => 1,
+ borcat => $borcat });
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
my $body;
# Analysing information and getting mail properties
-
- if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
- $mail{subject} = $1;
- $mail{subject} =~ s|\n?(.*)\n?|$1|;
- $mail{subject} = Encode::encode("UTF-8", $mail{subject});
+ my $subject;
+ if ( $template_res =~ /\<SUBJECT\>(?<subject>.*)\<END_SUBJECT\>/s ) {
+ $subject = $+{subject};
+ $subject =~ s|\n?(.*)\n?|$1|;
+ }
+ else {
+ $subject = "no subject";
}
- else { $mail{'subject'} = "no subject"; }
my $email_header = "";
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>(.*)<END_FILENAME>/s ) {
- $email_file = $1;
- $email_file =~ s|\n?(.*)\n?|$1|;
}
if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
$body = $1;
$body =~ s|\n?(.*)\n?|$1|;
- $body = encode_qp(Encode::encode("UTF-8", $body));
}
- $mail{body} = $body;
-
- my $boundary = "====" . time() . "====";
-
- $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
- my $isofile = encode_base64(encode("UTF-8", $iso2709));
- $boundary = '--' . $boundary;
- $mail{body} = <<END_OF_BODY;
-$boundary
-MIME-Version: 1.0
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
+ my $THE_body = <<END_OF_BODY;
$email_header
$body
-$boundary
-Content-Type: application/octet-stream; name="basket.iso2709"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="basket.iso2709"
-
-$isofile
-$boundary--
END_OF_BODY
- # Sending mail (if not empty basket)
- if ( defined($iso2709) && sendmail %mail ) {
- # do something if it works....
- $template->param( SENT => "1" );
+ if ( !defined $iso2709 ) {
+ carp "Error sending mail: empty basket";
+ $template->param( error => 1 );
}
else {
- # do something if it doesnt work....
- carp "Error sending mail: empty basket" if !defined($iso2709);
- carp "Error sending mail: $Mail::Sendmail::error" if $Mail::Sendmail::error;
- $template->param( error => 1 );
+ try {
+ # if you want to use the KohaAdmin address as from, that is the default no need to set it
+ my $email = Koha::Email->create({
+ to => $email_add,
+ reply_to => $email_replyto,
+ subject => $subject,
+ });
+ $email->header( 'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress') );
+ $email->text_body( $THE_body );
+ $email->attach(
+ Encode::encode( "UTF-8", $iso2709 ),
+ content_type => 'application/octet-stream',
+ name => 'basket.iso2709',
+ disposition => 'attachment',
+ );
+ my $library = $patron->library;
+ $email->transport( $library->smtp_server->transport );
+ $email->send_or_die;
+ $template->param( SENT => "1" );
+ }
+ catch {
+ carp "Error sending mail: $_";
+ $template->param( error => 1 );
+ };
}
+
$template->param( email_add => $email_add );
- output_html_with_http_headers $query, $cookie, $template->output;
+ output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
}
else {
+ my $new_session_id = $cookie->value;
$template->param(
bib_list => $bib_list,
url => "/cgi-bin/koha/opac-sendbasket.pl",
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
csrf_token => Koha::Token->new->generate_csrf(
- { session_id => scalar $query->cookie('CGISESSID'), } ),
+ { session_id => $new_session_id, } ),
);
- output_html_with_http_headers $query, $cookie, $template->output;
+ output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
}
projects / koha-ffzg.git / blobdiff