use Modern::Perl;
use CGI qw ( -utf8 );
-use Encode qw( encode );
-use Carp;
-
-use Mail::Sendmail;
-use MIME::QuotedPrint;
-use MIME::Base64;
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
+use Encode;
+use Carp qw( carp );
+use Try::Tiny qw( catch try );
+
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw(
+ GetBiblioData
+ GetMarcAuthors
+ GetMarcBiblio
+ GetMarcISBN
+ GetMarcSubjects
+);
+use C4::Items qw( GetItemsInfo );
+use C4::Output qw( output_html_with_http_headers );
use Koha::Email;
use Koha::Virtualshelves;
-my $query = new CGI;
+my $query = CGI->new;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "virtualshelves/sendshelfform.tt",
query => $query,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { catalogue => 1 },
}
);
-my $shelfid = $query->param('shelfid');
-my $email = $query->param('email');
+my $shelfid = $query->param('shelfid');
+my $to_address = $query->param('email');
my $dbh = C4::Context->dbh;
-if ($email) {
+if ($to_address) {
my $comment = $query->param('comment');
- my $message = Koha::Email->new();
- my %mail = $message->create_message_headers(
- {
- to => $email
- }
- );
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "virtualshelves/sendshelf.tt",
query => $query,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { catalogue => 1 },
}
);
embed_items => 1 });
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
- my $subtitle = GetRecordValue( 'subtitle', $record );
my @items = GetItemsInfo($biblionumber);
$dat->{MARCAUTHORS} = $marcauthorsarray;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = \@items;
- $dat->{subtitle} = $subtitle;
$dat->{HASAUTHORS} = $dat->{'author'} || @$marcauthorsarray;
$iso2709 .= $record->as_usmarc();
my $template_res = $template2->output();
my $body;
+ my $subject;
# Analysing information and getting mail properties
- if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
- $mail{subject} = $1;
- $mail{subject} =~ s|\n?(.*)\n?|$1|;
+ if ( $template_res =~ /<SUBJECT>(?<subject>.*)<END_SUBJECT>/s ) {
+ $subject = $+{subject};
+ $subject =~ s|\n?(.*)\n?|$1|;
+ }
+ else {
+ $subject = "no subject";
}
- else { $mail{'subject'} = "no subject"; }
- $mail{subject} = encode( 'MIME-Header', $mail{subject} );
my $email_header = "";
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 = "list.txt";
- if ( $template_res =~ /<FILENAME>(.*)<END_FILENAME>/s ) {
- $email_file = $1;
- $email_file =~ s|\n?(.*)\n?|$1|;
}
if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
$body = $1;
$body =~ s|\n?(.*)\n?|$1|;
- $body = encode_qp(Encode::encode("UTF-8", $body));
}
- my $boundary = "====" . time() . "====";
-
- # We set and put the multipart content
- $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
-
+ my $THE_body = <<END_OF_BODY;
$email_header
$body
-$boundary
-Content-Type: application/octet-stream; name="shelf.iso2709"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="shelf.iso2709"
-
-$isofile
-$boundary--
END_OF_BODY
- # Sending mail
- if ( sendmail %mail ) {
-
- # do something if it works....
+ try {
+ my $email = Koha::Email->create(
+ {
+ to => $to_address,
+ subject => $subject,
+ }
+ );
+ $email->text_body( $THE_body );
+ $email->attach(
+ Encode::encode("UTF-8", $iso2709),
+ content_type => 'application/octet-stream',
+ name => 'shelf.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 doesn't work....
- carp "Error sending mail: $Mail::Sendmail::error \n";
+ catch {
+ carp "Error sending mail: $_";
$template->param( error => 1 );
- }
+ };
- $template->param( email => $email );
+ $template->param( email => $to_address );
output_html_with_http_headers $query, $cookie, $template->output;
}