X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-sendshelf.pl;h=825de8175ed9ef9e4f5c81725d7ac1b6adc0a00e;hb=481f52308a32860e8594d13bd11086845e498ae4;hp=6a376c4d45afe7884ff9114c813e1e07b46ab2de;hpb=f098258e8cf2d616c6bbc35e44c6a1df47be8517;p=koha-ffzg.git diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl index 6a376c4d45..825de8175e 100755 --- a/opac/opac-sendshelf.pl +++ b/opac/opac-sendshelf.pl @@ -4,45 +4,54 @@ # # 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; -use C4::Members; - -my $query = new CGI; +# 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 + GetFrameworkCode + GetMarcAuthors + GetMarcBiblio + GetMarcISBN + GetMarcSubjects +); +use C4::Items qw( GetItemsInfo ); +use C4::Output qw( output_html_with_http_headers ); +use Koha::Email; +use Koha::Patrons; +use Koha::Virtualshelves; + +my $query = CGI->new; + +# if virtualshelves is disabled, leave immediately +if ( ! C4::Context->preference('virtualshelves') ) { + print $query->redirect("/cgi-bin/koha/errors/404.pl"); + exit; +} my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( { - template_name => "opac-sendshelfform.tmpl", + template_name => "opac-sendshelfform.tt", query => $query, type => "opac", - authnotrequired => 1, - flagsrequired => { borrow => 1 }, } ); @@ -51,129 +60,137 @@ 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 $email_from = C4::Context->preference('KohaAdminEmailAddress'); my $comment = $query->param('comment'); - my %mail = ( - To => $email, - From => $email_from - ); - my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( { - template_name => "opac-sendshelf.tmpl", + template_name => "opac-sendshelf.tt", query => $query, type => "opac", authnotrequired => 1, - flagsrequired => { borrow => 1 }, } ); - my @shelf = GetShelf($shelfid); - my ($items, $totitems) = GetShelfContents($shelfid); + my $patron = Koha::Patrons->find( $borrowernumber ); + my $borcat = $patron ? $patron->categorycode : q{}; + + 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 $record = GetMarcBiblio({ + biblionumber => $biblionumber, + embed_items => 1, + opac => 1, + borcat => $borcat }); + next unless $record; + my $fw = GetFrameworkCode($biblionumber); my $dat = GetBiblioData($biblionumber); - my $record = GetMarcBiblio($biblionumber); - my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); + my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my @items = &GetItemsInfo( $biblionumber, 'opac' ); + 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(); push( @results, $dat ); } - my $user = GetMember(borrowernumber => $borrowernumber); - $template2->param( BIBLIO_RESULTS => \@results, - email_sender => $email_from, comment => $comment, - shelfname => $shelf[1], - firstname => $user->{firstname}, - surname => $user->{surname}, + shelfname => $shelf->shelfname, + firstname => $patron->firstname, + surname => $patron->surname, ); # 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 => $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 doesnt work.... - carp "Error sending mail: $Mail::Sendmail::error \n"; + catch { + carp "Error sending mail: $_"; $template->param( error => 1 ); - } + }; - $template->param( email => $email ); - output_html_with_http_headers $query, $cookie, $template->output; + $template->param( + shelfid => $shelfid, + email => $email, + ); + output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; }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, undef, { force_no_caching => 1 }; }