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 C4::Members;
+use Encode;
+use Carp qw( carp );
+use Try::Tiny qw( catch try );
+
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw(
+ GetFrameworkCode
+ GetMarcISBN
+ GetMarcSubjects
+);
+use C4::Output qw( output_html_with_http_headers );
+use Koha::Biblios;
use Koha::Email;
use Koha::Patrons;
use Koha::Virtualshelves;
-my $query = new CGI;
+my $query = CGI->new;
# if virtualshelves is disabled, leave immediately
if ( ! C4::Context->preference('virtualshelves') ) {
template_name => "opac-sendshelfform.tt",
query => $query,
type => "opac",
- authnotrequired => 0,
}
);
my $shelfid = $query->param('shelfid');
my $email = $query->param('email');
-my $dbh = C4::Context->dbh;
-
my $shelf = Koha::Virtualshelves->find( $shelfid );
if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
-
-if ( $email ) {
- my $message = Koha::Email->new();
+ if ( $email ) {
my $comment = $query->param('comment');
- my %mail = $message->create_message_headers(
- {
- to => $email,
- }
- );
-
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "opac-sendshelf.tt",
);
my $patron = Koha::Patrons->find( $borrowernumber );
- my $borcat = $patron ? $patron->categorycode : q{};
my $shelf = Koha::Virtualshelves->find( $shelfid );
my $contents = $shelf->get_contents;
while ( my $content = $contents->next ) {
my $biblionumber = $content->biblionumber;
- my $record = GetMarcBiblio({
- biblionumber => $biblionumber,
- embed_items => 1,
- opac => 1,
- borcat => $borcat });
+ my $biblio = Koha::Biblios->find( $biblionumber ) or next;
+ my $dat = $biblio->unblessed;
+ my $record = $biblio->metadata->record(
+ {
+ embed_items => 1,
+ opac => 1,
+ patron => $patron,
+ }
+ );
next unless $record;
my $fw = GetFrameworkCode($biblionumber);
- my $dat = GetBiblioData($biblionumber);
- my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
+ my $marcauthorsarray = $biblio->get_marc_contributors;
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
- my $subtitle = GetRecordValue('subtitle', $record, $fw);
- my @items = GetItemsInfo( $biblionumber );
+ my $items = $biblio->items->search_ordered->filter_by_visible_in_opac({ patron => $patron });
$dat->{ISBN} = GetMarcISBN($record, $marcflavour);
$dat->{MARCSUBJCTS} = $marcsubjctsarray;
$dat->{MARCAUTHORS} = $marcauthorsarray;
$dat->{'biblionumber'} = $biblionumber;
- $dat->{ITEM_RESULTS} = \@items;
- $dat->{subtitle} = $subtitle;
+ $dat->{ITEM_RESULTS} = $items;
$dat->{HASAUTHORS} = $dat->{'author'} || @$marcauthorsarray;
+ $dat->{HOSTITEMENTRIES} = $biblio->get_marc_host;
$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
-MIME-Version: 1.0
-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="list.iso2709"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="list.iso2709"
-
-$isofile
-$boundary--
END_OF_BODY
- # Sending mail
- if ( sendmail %mail ) {
- # do something if it works....
- $template->param( SENT => "1" );
+ try {
+ my $email = Koha::Email->create(
+ {
+ to => $email,
+ subject => $subject,
+ }
+ );
+ $email->text_body( $THE_body );
+ $email->attach(
+ Encode::encode( "UTF-8", $iso2709 ),
+ content_type => 'application/octet-stream',
+ name => 'list.iso2709',
+ disposition => 'attachment',
+ );
+ my $library = Koha::Patrons->find( $borrowernumber )->library;
+ $email->transport( $library->smtp_server->transport );
+ $email->send_or_die;
+ $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(
shelfid => $shelfid,
- email => $email,
+ email => $email,
);
- output_html_with_http_headers $query, $cookie, $template->output;
-
+ output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
-}else{
+ } else {
$template->param( shelfid => $shelfid,
url => "/cgi-bin/koha/opac-sendshelf.pl",
);
- output_html_with_http_headers $query, $cookie, $template->output;
-}
-
+ output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
+ }
} else {
$template->param( invalidlist => 1,
url => "/cgi-bin/koha/opac-sendshelf.pl",
);
- output_html_with_http_headers $query, $cookie, $template->output;
+ output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
}
projects / srvgit / blobdiff