use Modern::Perl;
use CGI qw ( -utf8 );
-use Encode qw(encode);
-use Carp;
-use Mail::Sendmail;
-use MIME::QuotedPrint;
-use MIME::Base64;
-
-use C4::Biblio;
-use C4::Items;
-use C4::Auth;
-use C4::Output;
-use C4::Members;
-use C4::Templates ();
+use Encode;
+use Carp qw( carp );
+use Try::Tiny qw( catch try );
+
+use C4::Biblio qw(
+ GetMarcSubjects
+);
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Templates;
+use Koha::Biblios;
use Koha::Email;
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,
}
);
my $bib_list = $query->param('bib_list') || '';
my $email_add = $query->param('email_add');
-my $dbh = C4::Context->dbh;
-
if ( $email_add ) {
die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
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 = $patron->first_valid_email_address
- || C4::Context->preference('KohaAdminEmailAddress');
+ my $user_email = $patron->first_valid_email_address;
- 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(
- 'opac-sendbasket.tt', 'opac', $query,
- );
-
my @bibs = split( /\//, $bib_list );
- my @results;
my $iso2709;
- my $marcflavour = C4::Context->preference('marcflavour');
- foreach my $biblionumber (@bibs) {
- $template2->param( biblionumber => $biblionumber );
-
- my $dat = GetBiblioData($biblionumber);
- next unless $dat;
- my $record = GetMarcBiblio({
- biblionumber => $biblionumber,
- embed_items => 1 });
- my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
- my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
-
- my @items = GetItemsInfo( $biblionumber );
-
- my $hasauthors = 0;
- if($dat->{'author'} || @$marcauthorsarray) {
- $hasauthors = 1;
- }
-
-
- $dat->{MARCSUBJCTS} = $marcsubjctsarray;
- $dat->{MARCAUTHORS} = $marcauthorsarray;
- $dat->{HASAUTHORS} = $hasauthors;
- $dat->{'biblionumber'} = $biblionumber;
- $dat->{ITEM_RESULTS} = \@items;
-
- $iso2709 .= $record->as_usmarc();
-
- push( @results, $dat );
- }
-
- my $resultsarray = \@results;
-
- $template2->param(
- BIBLIO_RESULTS => $resultsarray,
- comment => $comment,
- firstname => $patron->firstname,
- surname => $patron->surname,
- );
-
- # Getting template result
- my $template_res = $template2->output();
- my $body;
+ foreach my $bib ( @bibs ) {
+ my $biblio = Koha::Biblios->find( $bib ) or next;
+ $iso2709 .= $biblio->metadata->record->as_usmarc();
+ };
- # 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});
- }
- 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
-
-$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" );
- }
- 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;
+ if ( !defined $iso2709 ) {
+ carp "Error sending mail: empty basket";
+ $template->param( error => 1 );
+ } elsif ( !defined $user_email or $user_email eq '' ) {
+ carp "Error sending mail: sender's email address is invalid";
$template->param( error => 1 );
+ } else {
+ my %loops = (
+ biblio => \@bibs,
+ );
+
+ my %substitute = (
+ comment => $comment,
+ );
+
+ my $letter = C4::Letters::GetPreparedLetter(
+ module => 'catalogue',
+ letter_code => 'CART',
+ lang => $patron->lang,
+ tables => {
+ borrowers => $borrowernumber,
+ },
+ message_transport_type => 'email',
+ loops => \%loops,
+ substitute => \%substitute,
+ );
+
+ my $attachment = {
+ filename => 'basket.iso2709',
+ type => 'application/octet-stream',
+ content => Encode::encode("UTF-8", $iso2709),
+ };
+
+ C4::Letters::EnqueueLetter({
+ letter => $letter,
+ message_transport_type => 'email',
+ borrowernumber => $patron->borrowernumber,
+ to_address => $email_add,
+ reply_address => $user_email,
+ attachments => [$attachment],
+ });
+
+ $template->param( SENT => 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 = $query->cookie('CGISESSID');
$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 / srvgit / blobdiff