X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=virtualshelves%2Fsendshelf.pl;h=9d104921005fb7ac98c596656c3971c528a43219;hb=9af429c33e6494bde0b31d2723abfd606d2076c2;hp=37a98ec887e7f08cd985fd850551080f908fe8e4;hpb=aedb86a6790babe52070439cab2f29e1d020cea8;p=srvgit diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index 37a98ec887..9d10492100 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -4,24 +4,24 @@ # # 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. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; use warnings; -use CGI; -use Encode qw(encode); +use CGI qw ( -utf8 ); +use Encode qw( encode ); use Carp; use Mail::Sendmail; @@ -31,13 +31,14 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; +use Koha::Email; +use Koha::Virtualshelves; my $query = new CGI; -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, @@ -48,45 +49,44 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( my $shelfid = $query->param('shelfid'); my $email = $query->param('email'); -my $dbh = C4::Context->dbh; +my $dbh = C4::Context->dbh; -if ( $email ) { - my $email_from = C4::Context->preference('KohaAdminEmailAddress'); - my $comment = $query->param('comment'); - - my %mail = ( - To => $email, - From => $email_from +if ($email) { + 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.tmpl", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => { catalogue => 1 }, + template_name => "virtualshelves/sendshelf.tt", + query => $query, + type => "intranet", + authnotrequired => 0, + 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->biblionumber; my $fw = GetFrameworkCode($biblionumber); my $dat = GetBiblioData($biblionumber); - my $record = GetMarcBiblio($biblionumber); + my $record = GetMarcBiblio($biblionumber, 1); my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my $subtitle = GetRecordValue('subtitle', $record, $fw); + my $subtitle = GetRecordValue( 'subtitle', $record, $fw ); - my @items = GetItemsInfo( $biblionumber ); + my @items = GetItemsInfo($biblionumber); $dat->{MARCNOTES} = $marcnotesarray; $dat->{MARCSUBJCTS} = $marcsubjctsarray; @@ -100,15 +100,10 @@ if ( $email ) { push( @results, $dat ); } - if (C4::Context->preference('OPACBaseURL')){ - $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') ); - } - $template2->param( BIBLIO_RESULTS => \@results, - email_sender => $email_from, comment => $comment, - shelfname => $shelf[1], + shelfname => $shelf->shelfname, ); # Getting template result @@ -116,29 +111,37 @@ if ( $email ) { my $body; # Analysing information and getting mail properties - if ( $template_res =~ /\n(.*)\n/s ) { - $mail{'subject'} = $1; + if ( $template_res =~ /(.*)/s ) { + $mail{'subject'} = Encode::encode("UTF-8", $1); + $mail{subject} =~ s|\n?(.*)\n?|$1|; } 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|; + $email_header = encode_qp(Encode::encode("UTF-8", $email_header)); } - my $email_file = "basket.txt"; - if ( $template_res =~ /\n(.*)\n/s ) { + my $email_file = "list.txt"; + if ( $template_res =~ /(.*)/s ) { $email_file = $1; + $email_file =~ s|\n?(.*)\n?|$1|; } - if ( $template_res =~ /\n(.*)\n/s ) { $body = encode_qp($1); } + if ( $template_res =~ /(.*)/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)); + my $isofile = encode_base64( encode( "UTF-8", $iso2709 ) ); $boundary = '--' . $boundary; $mail{body} = <param( SENT => "1" ); + $template->param( SENT => "1" ); } else { - # do something if it doesnt work.... + # do something if it doesn't work.... carp "Error sending mail: $Mail::Sendmail::error \n"; $template->param( error => 1 ); } @@ -171,10 +175,11 @@ END_OF_BODY $template->param( email => $email ); 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; }