# 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 <http://www.gnu.org/licenses>.
-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 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_and_exit output_html_with_http_headers );
+use C4::Templates;
+use Koha::Biblios;
use Koha::Email;
+use Koha::Token;
-my $query = new CGI;
+my $query = CGI->new;
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "basket/sendbasketform.tt",
- query => $query,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { borrow => 1 },
+ template_name => "basket/sendbasketform.tt",
+ query => $query,
+ type => "intranet",
+ 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 = Koha::Email->new();
- my %mail = $email->create_message_headers({ to => $email_add });
- my $comment = $query->param('comment');
- my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
+if ($email_add) {
+ output_and_exit( $query, $cookie, $template, 'wrong_csrf_token' )
+ unless Koha::Token->new->check_csrf(
{
- template_name => "basket/sendbasket.tt",
- query => $query,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { borrow => 1 },
- }
- );
-
- 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);
- my $record = GetMarcBiblio($biblionumber);
- my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
- my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
- my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
-
- my @items = GetItemsInfo( $biblionumber );
-
- my $hasauthors = 0;
- if($dat->{'author'} || @$marcauthorsarray) {
- $hasauthors = 1;
+ session_id => scalar $query->cookie('CGISESSID'),
+ token => scalar $query->param('csrf_token'),
}
-
-
- $dat->{MARCNOTES} = $marcnotesarray;
- $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,
- email_sender => $email_sender,
- comment => $comment
- );
+ my $patron = Koha::Patrons->find($borrowernumber);
+ my $user_email = $patron->first_valid_email_address;
- # Getting template result
- my $template_res = $template2->output();
- my $body;
+ my $comment = $query->param('comment');
- # Analysing information and getting mail properties
- if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
- $mail{subject} = $1;
- $mail{subject} =~ s|\n?(.*)\n?|$1|;
- }
- 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($email_header);
- }
+ my @bibs = split( /\//, $bib_list );
+ my $iso2709;
- my $email_file = "basket.txt";
- if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
- $email_file = $1;
- $email_file =~ s|\n?(.*)\n?|$1|;
+ foreach my $bib (@bibs) {
+ my $biblio = Koha::Biblios->find($bib) or next;
+ $iso2709 .= $biblio->metadata->record->as_usmarc();
}
- if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
- $body = $1;
- $body =~ s|\n?(.*)\n?|$1|;
- $body = encode_qp($body);
+ if ( !defined $iso2709 ) {
+ carp "Error sending mail: empty basket";
+ $template->param( error => 1 );
}
-
- my $boundary = "====" . time() . "====";
-
- # Writing mail
- $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
- my $isofile = encode_base64(encode("UTF-8", $iso2709));
- $boundary = '--' . $boundary;
- $mail{body} = <<END_OF_BODY;
-$boundary
-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 ( sendmail %mail ) {
- # do something if it works....
- $template->param( SENT => "1" );
+ elsif ( !defined $user_email or $user_email eq '' ) {
+ carp "Error sending mail: sender's email address is invalid";
+ $template->param( error => 1 );
}
else {
- # do something if it doesnt work....
- carp "Error sending mail: $Mail::Sendmail::error \n";
- $template->param( error => 1 );
+ 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 ),
+ };
+
+ my $message_id = C4::Letters::EnqueueLetter(
+ {
+ letter => $letter,
+ message_transport_type => 'email',
+ to_address => $email_add,
+ reply_address => $user_email,
+ attachments => [$attachment],
+ }
+ );
+
+ C4::Letters::SendQueuedMessages( { message_id => $message_id } );
+
+ $template->param( SENT => 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;
}
projects / srvgit / blobdiff