X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-sendshelf.pl;h=6e60bc913ad3219c9cf7d7c51db4acff0169eb1a;hb=488a3d6fed57b4e0d773157ee4a6ab7e4775e7a4;hp=6a376c4d45afe7884ff9114c813e1e07b46ab2de;hpb=63541e4223224831e4eb2bb51d108cc4a2155388;p=koha.git

diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index 6a376c4d45..6e60bc913a 100755
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -41,7 +41,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "opac-sendshelfform.tmpl",
         query           => $query,
         type            => "opac",
-        authnotrequired => 1,
+        authnotrequired => 0,
         flagsrequired   => { borrow => 1 },
     }
 );
@@ -51,6 +51,8 @@ my $email   = $query->param('email');
 
 my $dbh          = C4::Context->dbh;
 
+if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) {
+
 if ( $email ) {
     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
     my $comment    = $query->param('comment');
@@ -79,27 +81,33 @@ if ( $email ) {
     # retrieve biblios from shelf
     foreach my $biblio (@$items) {
         my $biblionumber = $biblio->{biblionumber};
-
+        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 $subtitle         = GetRecordValue('subtitle', $record, $fw);
 
-        my @items = &GetItemsInfo( $biblionumber, 'opac' );
+        my @items = GetItemsInfo( $biblionumber );
 
         $dat->{MARCNOTES}      = $marcnotesarray;
         $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
         $dat->{MARCAUTHORS}    = $marcauthorsarray;
         $dat->{'biblionumber'} = $biblionumber;
         $dat->{ITEM_RESULTS}   = \@items;
+        $dat->{subtitle}       = $subtitle;
 
         $iso2709 .= $record->as_usmarc();
 
         push( @results, $dat );
     }
 
-    my $user = GetMember(borrowernumber => $borrowernumber); 
+    my $user = GetMember(borrowernumber => $borrowernumber);
+
+    if (C4::Context->preference('OPACBaseURL')){
+          $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
+    }
 
     $template2->param(
         BIBLIO_RESULTS => \@results,
@@ -177,3 +185,10 @@ END_OF_BODY
                     );
     output_html_with_http_headers $query, $cookie, $template->output;
 }
+
+} else {
+    $template->param( invalidlist => 1,
+                      url     => "/cgi-bin/koha/opac-sendshelf.pl",
+    );
+    output_html_with_http_headers $query, $cookie, $template->output;
+}