#
# 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 <http://www.gnu.org/licenses>.
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use Encode qw(encode);
use Carp;
use Mail::Sendmail;
use MIME::QuotedPrint;
use MIME::Base64;
-use HTML::FormatText;
use C4::Biblio;
use C4::Items;
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 => 0,
- flagsrequired => { borrow => 1 },
}
);
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)
|| C4::Context->preference('KohaAdminEmailAddress');
- my $email_from = 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,
- 'Reply-To' => $email_replyto,
-# 'X-Orig-IP' => $ENV{'REMOTE_ADDR'},
-# FIXME Commented out for now: discussion on privacy issue
- 'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress'),
- );
+
+ # 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 => 0,
- flagsrequired => { borrow => 1 },
}
);
$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 );
}
- $dat->{MARCNOTES} = $marcnotesarray;
$dat->{MARCSUBJCTS} = $marcsubjctsarray;
$dat->{MARCAUTHORS} = $marcauthorsarray;
$dat->{HASAUTHORS} = $hasauthors;
$template2->param(
BIBLIO_RESULTS => $resultsarray,
- email_sender => $email_sender,
comment => $comment,
firstname => $user->{firstname},
surname => $user->{surname},
my $body;
# Analysing information and getting mail properties
- if ( $template_res =~ /<SUBJECT>\n(.*)\n?<END_SUBJECT>/s ) {
- $mail{'subject'} = $1;
+
+ 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>\n(.*)\n?<END_HEADER>/s ) {
+ 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>\n(.*)\n?<END_FILENAME>/s ) {
+ if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
$email_file = $1;
+ $email_file =~ s|\n?(.*)\n?|$1|;
}
- if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) {
+ 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\"";
projects / koha.git / blobdiff