#!/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
# 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+use warnings;
use CGI;
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;
my $query = new CGI;
template_name => "opac-sendbasketform.tmpl",
query => $query,
type => "opac",
- authnotrequired => 1,
+ authnotrequired => 0,
flagsrequired => { borrow => 1 },
}
);
my $dbh = C4::Context->dbh;
if ( $email_add ) {
+ 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
+ From => $email_from,
+ 'Reply-To' => $email_replyto,
+ 'X-Orig-IP' => $ENV{'REMOTE_ADDR'},
+ 'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress'),
);
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
template_name => "opac-sendbasket.tmpl",
query => $query,
type => "opac",
- authnotrequired => 1,
+ authnotrequired => 0,
flagsrequired => { borrow => 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) {
+ $hasauthors = 1;
+ }
+
$dat->{MARCNOTES} = $marcnotesarray;
$dat->{MARCSUBJCTS} = $marcsubjctsarray;
$dat->{MARCAUTHORS} = $marcauthorsarray;
+ $dat->{HASAUTHORS} = $hasauthors;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
}
my $resultsarray = \@results;
+
$template2->param(
BIBLIO_RESULTS => $resultsarray,
email_sender => $email_sender,
- comment => $comment
+ comment => $comment,
+ firstname => $user->{firstname},
+ surname => $user->{surname},
);
# Getting template result
my $body;
# Analysing information and getting mail properties
- if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
+ if ( $template_res =~ /<SUBJECT>\n(.*)\n?<END_SUBJECT>/s ) {
$mail{'subject'} = $1;
}
else { $mail{'subject'} = "no subject"; }
my $email_header = "";
- if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
+ if ( $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s ) {
$email_header = $1;
}
my $email_file = "basket.txt";
- if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
+ if ( $template_res =~ /<FILENAME>\n(.*)\n?<END_FILENAME>/s ) {
$email_file = $1;
}
- if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = $1; }
+ if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) {
+ $body = $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} = <<END_OF_BODY;
$boundary
-Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
$email_header
$boundary--
END_OF_BODY
- # Sending mail
- if ( sendmail %mail ) {
- # do something if it works....
+ # Sending mail (if not empty basket)
+ if ( defined($iso2709) && sendmail %mail ) {
+ # do something if it works....
$template->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 );