X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=virtualshelves%2Fsendshelf.pl;h=58b4d144a25549f1f15e14ead880460bf9802ca3;hb=d5621ce9512f4f8244deab843318dd08dbd7148a;hp=16ada89abb3b5b2a77fa8c0ecbe68857437eef44;hpb=0fff79d6b464eb9e053ed568234e43695fbec66b;p=srvgit diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index 16ada89abb..58b4d144a2 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -4,94 +4,91 @@ # # 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. - -use strict; -use warnings; - -use CGI; -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::VirtualShelves; +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use CGI qw ( -utf8 ); +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 ( +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { - template_name => "virtualshelves/sendshelfform.tmpl", + 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 $dbh = C4::Context->dbh; +my $shelfid = $query->param('shelfid'); +my $to_address = $query->param('email'); -if ( $email ) { - my $email_from = C4::Context->preference('KohaAdminEmailAddress'); - my $comment = $query->param('comment'); +my $dbh = C4::Context->dbh; - my %mail = ( - To => $email, - From => $email_from - ); +if ($to_address) { + my $comment = $query->param('comment'); my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( { - template_name => "virtualshelves/sendshelf.tmpl", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => { catalogue => 1 }, + template_name => "virtualshelves/sendshelf.tt", + query => $query, + type => "intranet", + flagsrequired => { catalogue => 1 }, } ); - my @shelf = GetShelf($shelfid); - my ($items, $totitems) = GetShelfContents($shelfid); - my $marcflavour = C4::Context->preference('marcflavour'); + my $shelf = Koha::Virtualshelves->find( $shelfid ); + my $contents = $shelf->get_contents; + my $marcflavour = C4::Context->preference('marcflavour'); my $iso2709; my @results; - # retrieve biblios from shelf - foreach my $biblio (@$items) { - my $biblionumber = $biblio->{biblionumber}; - + while ( my $content = $contents->next ) { + my $biblionumber = $content->biblionumber; + my $biblio = Koha::Biblios->find( $biblionumber ); my $dat = GetBiblioData($biblionumber); - my $record = GetMarcBiblio($biblionumber); - my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); - my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); + my $record = GetMarcBiblio({ + biblionumber => $biblionumber, + embed_items => 1 }); + my $marcauthorsarray = $biblio->get_authors_from_MARC; my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my @items = GetItemsInfo( $biblionumber ); + my @items = GetItemsInfo($biblionumber); - $dat->{MARCNOTES} = $marcnotesarray; + $dat->{ISBN} = GetMarcISBN($record, $marcflavour); $dat->{MARCSUBJCTS} = $marcsubjctsarray; $dat->{MARCAUTHORS} = $marcauthorsarray; $dat->{'biblionumber'} = $biblionumber; $dat->{ITEM_RESULTS} = \@items; + $dat->{HASAUTHORS} = $dat->{'author'} || @$marcauthorsarray; $iso2709 .= $record->as_usmarc(); @@ -100,75 +97,72 @@ if ( $email ) { $template2->param( BIBLIO_RESULTS => \@results, - email_sender => $email_from, comment => $comment, - shelfname => $shelf[1], + shelfname => $shelf->shelfname, ); # Getting template result my $template_res = $template2->output(); my $body; + my $subject; # Analysing information and getting mail properties - if ( $template_res =~ /\n(.*)\n/s ) { - $mail{'subject'} = $1; + if ( $template_res =~ /(?.*)/s ) { + $subject = $+{subject}; + $subject =~ s|\n?(.*)\n?|$1|; + } + else { + $subject = "no 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|; } - my $email_file = "basket.txt"; - if ( $template_res =~ /\n(.*)\n/s ) { - $email_file = $1; + if ( $template_res =~ /(.*)/s ) { + $body = $1; + $body =~ s|\n?(.*)\n?|$1|; } - if ( $template_res =~ /\n(.*)\n/s ) { $body = encode_qp($1); } - - 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} = <param( SENT => "1" ); + 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 doesnt 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; - -}else{ - $template->param( shelfid => $shelfid, - url => "/cgi-bin/koha/virtualshelves/sendshelf.pl", - ); +} +else { + $template->param( + shelfid => $shelfid, + url => "/cgi-bin/koha/virtualshelves/sendshelf.pl", + ); output_html_with_http_headers $query, $cookie, $template->output; }