ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / opac / opac-sendshelf.pl

diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index b0215cc..a5b393e 100755 (executable)
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -17,8 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use Encode qw( encode );
@@ -31,13 +30,19 @@ use C4::Auth;
 use C4::Biblio;
 use C4::Items;
 use C4::Output;
-use C4::VirtualShelves;
 use C4::Members;
 use Koha::Email;
+use Koha::Patrons;
 use Koha::Virtualshelves;
 
 my $query = new CGI;
 
+# 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.tt",
@@ -53,7 +58,7 @@ my $email   = $query->param('email');
 my $dbh          = C4::Context->dbh;
 
 my $shelf = Koha::Virtualshelves->find( $shelfid );
-if ( $shelf->can_be_viewed( $borrowernumber ) ) {
+if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) {
 
 if ( $email ) {
     my $message = Koha::Email->new();
@@ -74,19 +79,26 @@ if ( $email ) {
         }
     );
 
+    my $patron = Koha::Patrons->find( $borrowernumber );
+    my $borcat = $patron ? $patron->categorycode : q{};
+
     my $shelf = Koha::Virtualshelves->find( $shelfid );
-    my ($items, $totitems)  = GetShelfContents($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, 1);
-        my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
+
         my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
         my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
         my $subtitle         = GetRecordValue('subtitle', $record, $fw);
@@ -94,7 +106,6 @@ if ( $email ) {
         my @items = GetItemsInfo( $biblionumber );
 
         $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
-        $dat->{MARCNOTES}      = $marcnotesarray;
         $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{'biblionumber'} = $biblionumber;
@@ -107,14 +118,12 @@ if ( $email ) {
         push( @results, $dat );
     }
 
-    my $user = GetMember(borrowernumber => $borrowernumber);
-
     $template2->param(
         BIBLIO_RESULTS => \@results,
         comment        => $comment,
         shelfname      => $shelf->shelfname,
-        firstname      => $user->{firstname},
-        surname        => $user->{surname},
+        firstname      => $patron->firstname,
+        surname        => $patron->surname,
     );
 
     # Getting template result
@@ -127,7 +136,7 @@ if ( $email ) {
         $mail{subject} =~ s|\n?(.*)\n?|$1|;
     }
     else { $mail{'subject'} = "no subject"; }
-    $mail{subject} = Encode::encode("UTF-8", $mail{subject});
+    $mail{subject} = encode('MIME-Header', $mail{subject});
 
     my $email_header = "";
     if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
@@ -179,12 +188,15 @@ END_OF_BODY
         $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 );
     }
 
-    $template->param( email => $email );
+    $template->param(
+        shelfid => $shelfid,
+        email => $email,
+    );
     output_html_with_http_headers $query, $cookie, $template->output;