X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-sendbasket.pl;h=97b64fd6d626d028643c987d8773104f6b1af22e;hb=caae161a4e64280ba9d8fbd0a5028a6818b3a2a6;hp=621396542cfb3d60411e45834d657e54cc889088;hpb=2a3f7c141798121a75fc9ee670af0fdde431d9c2;p=koha.git diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index 621396542c..97b64fd6d6 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -1,25 +1,28 @@ #!/usr/bin/perl +# Copyright Doxulting 2004 +# # 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 CGI; +use CGI qw ( -utf8 ); use Encode qw(encode); +use Carp; use Mail::Sendmail; use MIME::QuotedPrint; @@ -30,40 +33,46 @@ use C4::Auth; use C4::Output; use C4::Biblio; use C4::Members; +use Koha::Email; my $query = new CGI; my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( { - template_name => "opac-sendbasketform.tmpl", + template_name => "opac-sendbasketform.tt", query => $query, type => "opac", - authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, + authnotrequired => 0, } ); 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_from = C4::Context->preference('KohaAdminEmailAddress'); + my $email = Koha::Email->new(); + my $user = GetMember(borrowernumber => $borrowernumber); + my $user_email = GetFirstValidEmailAddress($borrowernumber) + || C4::Context->preference('KohaAdminEmailAddress'); + + my $email_replyto = "$user->{firstname} $user->{surname} <$user_email>"; my $comment = $query->param('comment'); - my %mail = ( - To => $email_add, - From => $email_from - ); + + # 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.tmpl", + template_name => "opac-sendbasket.tt", query => $query, type => "opac", - authnotrequired => 1, - flagsrequired => { borrow => 1 }, + authnotrequired => 0, } ); @@ -75,12 +84,12 @@ 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, 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 +97,6 @@ if ( $email_add ) { } - $dat->{MARCNOTES} = $marcnotesarray; $dat->{MARCSUBJCTS} = $marcsubjctsarray; $dat->{MARCAUTHORS} = $marcauthorsarray; $dat->{HASAUTHORS} = $hasauthors; @@ -102,11 +110,8 @@ if ( $email_add ) { my $resultsarray = \@results; - my $user = GetMember(borrowernumber => $borrowernumber); - $template2->param( BIBLIO_RESULTS => $resultsarray, - email_sender => $email_sender, comment => $comment, firstname => $user->{firstname}, surname => $user->{surname}, @@ -117,39 +122,44 @@ if ( $email_add ) { my $body; # Analysing information and getting mail properties - if ( $template_res =~ /\n(.*)\n/s ) { - $mail{'subject'} = $1; + + if ( $template_res =~ /(.*)/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 =~ /
\n(.*)\n/s ) { + 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 =~ /\n(.*)\n/s ) { + 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)); } - if ( $template_res =~ /\n(.*)\n/s ) { $body = encode_qp($1); } + $mail{body} = $body; 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" ); } else { # do something if it doesnt work.... - warn "Error sending mail: $Mail::Sendmail::error \n"; + carp "Error sending mail: empty basket" if !defined($iso2709); + carp "Error sending mail: $Mail::Sendmail::error" if $Mail::Sendmail::error; $template->param( error => 1 ); } $template->param( email_add => $email_add );