X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-sendbasket.pl;h=278cfd34a6a7c4766cf48055ec422f1528079314;hb=6b90fa3ec4ca7ec9515a59527fb9ff7f4d823318;hp=1dac95489ef3be3b5463aff8a4778911640c8bbb;hpb=3291c8b130e841f017e1dc55178590f67ca61e77;p=koha-ffzg.git diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index 1dac95489e..278cfd34a6 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -4,79 +4,66 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use strict; -use warnings; +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::Biblio; -use C4::Members; +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, - flagsrequired => { borrow => 1 }, } ); -my $bib_list = $query->param('bib_list'); +my $bib_list = $query->param('bib_list') || ''; my $email_add = $query->param('email_add'); -my $email_sender = $query->param('email_sender'); - -my $dbh = C4::Context->dbh; if ( $email_add ) { - my $email = Koha::Email->new(); - my $user = GetMember(borrowernumber => $borrowernumber); - my $user_email = GetFirstValidEmailAddress($borrowernumber) + die "Wrong CSRF token" unless Koha::Token->new->check_csrf({ + session_id => scalar $query->cookie('CGISESSID'), + token => scalar $query->param('csrf_token'), + }); + my $patron = Koha::Patrons->find( $borrowernumber ); + my $user_email = $patron->first_valid_email_address || C4::Context->preference('KohaAdminEmailAddress'); - my $email_replyto = "$user->{firstname} $user->{surname} <$user_email>"; + 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'); - - my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( - { - template_name => "opac-sendbasket.tt", - query => $query, - type => "opac", - authnotrequired => 0, - flagsrequired => { borrow => 1 }, - } + # 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 ); @@ -86,26 +73,33 @@ if ( $email_add ) { foreach my $biblionumber (@bibs) { $template2->param( biblionumber => $biblionumber ); - my $dat = GetBiblioData($biblionumber); - my $record = GetMarcBiblio($biblionumber); - my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); - my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); + my $biblio = Koha::Biblios->find( $biblionumber ) or next; + my $dat = $biblio->unblessed; + my $record = $biblio->metadata->record( + { + embed_items => 1, + opac => 1, + patron => $patron, + } + ); + my $marcauthorsarray = $biblio->get_marc_contributors; my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my @items = GetItemsInfo( $biblionumber ); + my $items = $biblio->items->search_ordered->filter_by_visible_in_opac({ patron => $patron }); my $hasauthors = 0; if($dat->{'author'} || @$marcauthorsarray) { $hasauthors = 1; } - - $dat->{MARCNOTES} = $marcnotesarray; $dat->{MARCSUBJCTS} = $marcsubjctsarray; $dat->{MARCAUTHORS} = $marcauthorsarray; $dat->{HASAUTHORS} = $hasauthors; $dat->{'biblionumber'} = $biblionumber; - $dat->{ITEM_RESULTS} = \@items; + $dat->{ITEM_RESULTS} = $items; + my ( $host, $relatedparts ) = $biblio->get_marc_host; + $dat->{HOSTITEMENTRIES} = $host; + $dat->{RELATEDPARTS} = $relatedparts; $iso2709 .= $record->as_usmarc(); @@ -116,10 +110,9 @@ if ( $email_add ) { $template2->param( BIBLIO_RESULTS => $resultsarray, - email_sender => $email_sender, comment => $comment, - firstname => $user->{firstname}, - surname => $user->{surname}, + firstname => $patron->firstname, + surname => $patron->surname, ); # Getting template result @@ -127,77 +120,74 @@ if ( $email_add ) { my $body; # Analysing information and getting mail properties - - if ( $template_res =~ /(.*)/s ) { - $mail{subject} = $1; - $mail{subject} =~ s|\n?(.*)\n?|$1|; - $mail{subject} = Encode::encode("UTF-8", $mail{subject}); + my $subject; + if ( $template_res =~ /\(?.*)\/s ) { + $subject = $+{subject}; + $subject =~ s|\n?(.*)\n?|$1|; + } + else { + $subject = "no subject"; } - else { $mail{'subject'} = "no subject"; } my $email_header = ""; if ( $template_res =~ /
(.*)/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 =~ /(.*)/s ) { - $email_file = $1; - $email_file =~ s|\n?(.*)\n?|$1|; } if ( $template_res =~ /(.*)/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} = <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 { - $template->param( bib_list => $bib_list ); + 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 => $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 }; }