X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=basket%2Fsendbasket.pl;h=1ea56fce6a9d4d49cd6fd2d98dc038bad1907549;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=107a7377dae41b6aae66afa8b84457434d505c56;hpb=88b3711ca918877796d8577c54efe3f0aba96673;p=srvgit diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 107a7377da..1ea56fce6a 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -2,69 +2,67 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 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; -use Encode qw(encode); -use Carp; +use CGI qw ( -utf8 ); +use Encode; +use Carp qw( carp ); +use Try::Tiny qw( catch try ); -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::Biblio qw( + GetBiblioData + GetMarcAuthors + GetMarcBiblio + GetMarcSubjects +); +use C4::Items qw( GetItemsInfo ); +use C4::Auth qw( get_template_and_user ); +use C4::Output qw( output_and_exit output_html_with_http_headers ); +use C4::Templates; +use Koha::Email; +use Koha::Token; -my $query = new CGI; +my $query = CGI->new; my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( { - template_name => "basket/sendbasketform.tmpl", + template_name => "basket/sendbasketform.tt", query => $query, type => "intranet", - authnotrequired => 0, - flagsrequired => { borrow => 1 }, + flagsrequired => { catalogue => 1 }, } ); -my $bib_list = $query->param('bib_list'); -my $email_add = $query->param('email_add'); -my $email_sender = $query->param('email_sender'); +my $bib_list = $query->param('bib_list') || ''; +my $email_add = $query->param('email_add'); -my $dbh = C4::Context->dbh; +my $dbh = C4::Context->dbh; if ( $email_add ) { - my $email_from = C4::Context->preference('KohaAdminEmailAddress'); - my $comment = $query->param('comment'); - my %mail = ( - To => $email_add, - From => $email_from - ); - - my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( - { - template_name => "basket/sendbasket.tmpl", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => { borrow => 1 }, - } + output_and_exit( $query, $cookie, $template, 'wrong_csrf_token' ) + unless Koha::Token->new->check_csrf({ + session_id => scalar $query->cookie('CGISESSID'), + token => scalar $query->param('csrf_token'), + }); + my $comment = $query->param('comment'); + + # Since we are already logged in, no need to check credentials again + # when loading a second template. + my $template2 = C4::Templates::gettemplate( + 'basket/sendbasket.tt', 'intranet', $query, ); my @bibs = split( /\//, $bib_list ); @@ -75,12 +73,14 @@ if ( $email_add ) { $template2->param( biblionumber => $biblionumber ); my $dat = GetBiblioData($biblionumber); - my $record = GetMarcBiblio($biblionumber); - my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); + 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, 'opac' ); + my @items = GetItemsInfo( $biblionumber ); my $hasauthors = 0; if($dat->{'author'} || @$marcauthorsarray) { @@ -88,7 +88,6 @@ if ( $email_add ) { } - $dat->{MARCNOTES} = $marcnotesarray; $dat->{MARCSUBJCTS} = $marcsubjctsarray; $dat->{MARCAUTHORS} = $marcauthorsarray; $dat->{HASAUTHORS} = $hasauthors; @@ -103,7 +102,6 @@ if ( $email_add ) { my $resultsarray = \@results; $template2->param( BIBLIO_RESULTS => $resultsarray, - email_sender => $email_sender, comment => $comment ); @@ -111,72 +109,68 @@ if ( $email_add ) { my $template_res = $template2->output(); my $body; + my $subject; # Analysing information and getting mail properties - if ( $template_res =~ /\n(.*)\n/s ) { - $mail{'subject'} = $1; + 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 =~ /
\n(.*)\n/s ) { + if ( $template_res =~ /
(.*)/s ) { $email_header = $1; + $email_header =~ s|\n?(.*)\n?|$1|; } - my $email_file = "basket.txt"; - if ( $template_res =~ /\n(.*)\n/s ) { - $email_file = $1; + if ( $template_res =~ /(.*)/s ) { + $body = $1; + $body =~ s|\n?(.*)\n?|$1|; } - if ( $template_res =~ /\n(.*)\n/s ) { $body = encode_qp($1); } - - my $boundary = "====" . time() . "===="; - - # $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\""; - # - # $email_header = encode_qp($email_header); - # - # $boundary = "--".$boundary; - # - # # Writing mail - # $mail{body} = - $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\""; - my $isofile = encode_base64(encode("UTF-8", $iso2709)); - $boundary = '--' . $boundary; - $mail{body} = <param( SENT => "1" ); + try { + + my $email = Koha::Email->create( + { + to => $email_add, + subject => $subject, + } + ); + + $email->text_body( $THE_body ); + $email->attach( + Encode::encode( "UTF-8", $iso2709 ), + content_type => 'application/octet-stream', + name => 'basket.iso2709', + disposition => 'attachment', + ); + + my $library = Koha::Patrons->find( $borrowernumber )->library; + $email->send_or_die({ transport => $library->smtp_server->transport }); + $template->param( SENT => "1" ); } - else { - # do something if it doesnt work.... - carp "Error sending mail: $Mail::Sendmail::error \n"; + catch { + carp "Error sending mail: $_"; $template->param( error => 1 ); - } + }; + $template->param( email_add => $email_add ); output_html_with_http_headers $query, $cookie, $template->output; } else { - $template->param( bib_list => $bib_list ); $template->param( + bib_list => $bib_list, url => "/cgi-bin/koha/basket/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'), }), ); output_html_with_http_headers $query, $cookie, $template->output; }