X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-addbybiblionumber.pl;h=4edbd133e71e1c8c0c207e022aeaf6c0f2a0bfb0;hb=7e991d0702dac22e1a578b9544c2029f73a34f17;hp=a5decf723912a428e30333bf38884c85d4809c25;hpb=ab1beed06f249d1e7d0be5bb1b584e62f5b48783;p=srvgit

diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index a5decf7239..4edbd133e7 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 
-#script to provide virtualshelf management
-#
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2016 Koha Development Team
 #
 # This file is part of Koha.
 #
@@ -19,190 +18,185 @@
 # 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 C4::Biblio;
-use C4::Output;
-use C4::Auth;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
 
+use Koha::Biblios;
 use Koha::Virtualshelves;
 
-our $query        	= new CGI;
-our @biblionumber 	= $query->param('biblionumber');
-our $selectedshelf 	= $query->param('selectedshelf');
-our $newshelf 		= $query->param('newshelf');
-our $shelfnumber  	= $query->param('shelfnumber');
-our $newvirtualshelf	= $query->param('newvirtualshelf');
-our $category     	= $query->param('category');
-our $authorized          = 1;
-our $errcode		= 0;
-our @biblios = ();
+my $query           = CGI->new;
+my @biblionumbers   = $query->multi_param('biblionumber');
+my $selectedshelf   = $query->param('selectedshelf');
+my $newshelf        = $query->param('newshelf');
+my $shelfnumber     = $query->param('shelfnumber');
+my $newvirtualshelf = $query->param('newvirtualshelf');
+my $public          = $query->param('public');
+my ( $errcode, $authorized ) = ( 0, 1 );
+my @biblios;
 
 # if virtualshelves is disabled, leave immediately
-if ( ! C4::Context->preference('virtualshelves') ) {
+if ( !C4::Context->preference('virtualshelves') ) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl");
     exit;
 }
 
-if (scalar(@biblionumber) == 1) {
-    @biblionumber = (split /\//,$biblionumber[0]);
+if ( scalar(@biblionumbers) == 1 ) {
+    @biblionumbers = ( split /\//, $biblionumbers[0] );
 }
 
-our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "opac-addbybiblionumber.tt",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {   template_name   => "opac-addbybiblionumber.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
-if( $newvirtualshelf) {
-    HandleNewVirtualShelf();
-    exit if $authorized;
-    ShowTemplate(); #error message
-}
-elsif($shelfnumber) {
-    HandleShelfNumber();
-    exit if $authorized;
-    ShowTemplate(); #error message
-}
-elsif($selectedshelf) {
-    HandleSelectedShelf();
-    LoadBib() if $authorized;
-    ShowTemplate();
-}
-else {
-    HandleSelect();
-    LoadBib() if $authorized;
-    ShowTemplate();
-}
-#end
-
-sub HandleNewVirtualShelf {
-    if ( $loggedinuser > 0 and
-        (
-            $category == 1
-                or $category == 2 and $loggedinuser>0 && C4::Context->preference('OpacAllowPublicListCreation')
-        )
-    ) {
-        my $shelf = eval {
-            Koha::Virtualshelf->new(
-                {
-                    shelfname => $newvirtualshelf,
-                    category => $category,
-                    owner => $loggedinuser,
-                }
-            )->store;
-        };
+if ($newvirtualshelf) {
+    if ($loggedinuser > 0
+        and (  !$public
+            or $public and $loggedinuser > 0 && C4::Context->preference('OpacAllowPublicListCreation') )
+      ) {
+        my $shelf = eval { Koha::Virtualshelf->new( { shelfname => $newvirtualshelf, public => $public, owner => $loggedinuser, } )->store; };
         if ( $@ or not $shelf ) {
+            $errcode    = 1;
             $authorized = 0;
-            $errcode = 1;
-            return;
-        }
+        } else {
+            for my $biblionumber (@biblionumbers) {
+                $shelf->add_biblio( $biblionumber, $loggedinuser );
+            }
 
-        for my $bib (@biblionumber) {
-            $shelf->add_biblio( $bib, $loggedinuser );
+            #Reload the page where you came from
+            print $query->header;
+            print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
+            exit;
         }
-
-        #Reload the page where you came from
-        print $query->header;
-        print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
     }
-}
-
-sub HandleShelfNumber {
+} elsif ($shelfnumber) {
     my $shelfnumber = $query->param('shelfnumber');
-    my $shelf = Koha::Virtualshelves->find( $shelfnumber );
-    if ( $shelf->can_biblios_be_added( $loggedinuser ) ) {
-        for my $bib (@biblionumber) {
-            $shelf->add_biblio( $bib, $loggedinuser );
+    my $shelf       = Koha::Virtualshelves->find($shelfnumber);
+    if ( $shelf->can_biblios_be_added($loggedinuser) ) {
+        for my $biblionumber (@biblionumbers) {
+            $shelf->add_biblio( $biblionumber, $loggedinuser );
         }
+
         #Close this page and return
         print $query->header;
         print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"self.close();\"></body></html>";
+        exit;
     } else {
-        # TODO
+        $authorized = 0;
     }
-}
-
-sub HandleSelectedShelf {
+} elsif ($selectedshelf) {
     my $shelfnumber = $query->param('selectedshelf');
-    my $shelf = Koha::Virtualshelves->find( $shelfnumber );
-    if ( $shelf->can_biblios_be_added( $loggedinuser ) ) {
+    my $shelf       = Koha::Virtualshelves->find($shelfnumber);
+    if ( $shelf->can_biblios_be_added($loggedinuser) ) {
         $template->param(
-            singleshelf               => 1,
-            shelfnumber               => $shelf->shelfnumber,
-            shelfname                 => $shelf->shelfname,
+            singleshelf => 1,
+            shelfnumber => $shelf->shelfnumber,
+            shelfname   => $shelf->shelfname,
         );
     } else {
-        # TODO
+        $authorized = 0;
     }
-}
-
-sub HandleSelect {
-    return unless $authorized= $loggedinuser>0;
-    my $private_shelves = Koha::Virtualshelves->search(
-        {
-            category => 1,
-            owner => $loggedinuser,
-        },
-        { order_by => 'shelfname' }
-    );
-    my $shelves_shared_with_me = Koha::Virtualshelves->search(
-        {
-            category => 1,
-            'virtualshelfshares.borrowernumber' => $loggedinuser,
-            -or => {
-                allow_add => 1,
-                owner => $loggedinuser,
+} else {
+    if ( $loggedinuser > 0 ) {
+        my $private_shelves = Koha::Virtualshelves->search(
+            {   public   => 0,
+                owner    => $loggedinuser,
+                allow_change_from_owner => 1,
+            },
+            { order_by => 'shelfname' }
+        );
+        my $shelves_shared_with_me = Koha::Virtualshelves->search(
+            {   public                              => 0,
+                'virtualshelfshares.borrowernumber' => $loggedinuser,
+                allow_change_from_others            => 1,
+            },
+            { join => 'virtualshelfshares', }
+        );
+        my $public_shelves;
+        if ( $loggedinuser ) {
+            if ( Koha::Patrons->find( $loggedinuser )->can_patron_change_staff_only_lists ) {
+                $public_shelves = Koha::Virtualshelves->search(
+                    {   public   => 1,
+                        -or      => [
+                            -and => {
+                                allow_change_from_owner => 1,
+                                owner     => $loggedinuser,
+                            },
+                            allow_change_from_others => 1,
+                            allow_change_from_staff  => 1
+                        ],
+                    },
+                    { order_by => 'shelfname' }
+                );
+            } else {
+                $public_shelves = Koha::Virtualshelves->search(
+                    {   public   => 1,
+                        -or      => [
+                            -and => {
+                                allow_change_from_owner => 1,
+                                owner => $loggedinuser,
+                            },
+                            allow_change_from_others => 1,
+                        ],
+                    },
+                    {order_by => 'shelfname' }
+                );
             }
-        },
-        {
-            join => 'virtualshelfshares',
+        } else {
+            $public_shelves = Koha::Virtualshelves->search(
+                {   public   => 1,
+                    -or      => [
+                        -and => {
+                            allow_change_from_owner => 1,
+                            owner => $loggedinuser,
+                        },
+                        allow_change_from_others => 1,
+                    ],
+                },
+                {order_by => 'shelfname' }
+            );
         }
-    );
-    my $public_shelves= Koha::Virtualshelves->search(
-        {
-            category => 2,
-            -or => {
-                allow_add => 1,
-                owner => $loggedinuser,
-            }
-        },
-        { order_by => 'shelfname' }
-    );
-    $template->param (
-        private_shelves => $private_shelves,
-        private_shelves_shared_with_me => $shelves_shared_with_me,
-        public_shelves  => $public_shelves,
-    );
+
+        $template->param(
+            private_shelves                => $private_shelves,
+            private_shelves_shared_with_me => $shelves_shared_with_me,
+            public_shelves                 => $public_shelves,
+        );
+    } else {
+        $authorized = 0;
+    }
 }
 
-sub LoadBib {
-    for my $bib (@biblionumber) {
-        my $data = GetBiblioData( $bib );
-        push(@biblios,
-            { biblionumber => $bib,
-              title        => $data->{'title'},
-              author       => $data->{'author'},
-        } );
+if ($authorized) {
+    for my $biblionumber (@biblionumbers) {
+        my $biblio = Koha::Biblios->find( $biblionumber );
+        push(
+            @biblios,
+            {   biblionumber => $biblionumber,
+                title        => $biblio->title,
+                subtitle     => $biblio->subtitle,
+                medium       => $biblio->medium,
+                part_number  => $biblio->part_number,
+                part_name    => $biblio->part_name,
+                author       => $biblio->author,
+            }
+        );
     }
     $template->param(
-        multiple => (scalar(@biblios) > 1),
-    total    => scalar @biblios,
-    biblios  => \@biblios,
+        multiple => ( scalar(@biblios) > 1 ),
+        total    => scalar @biblios,
+        biblios  => \@biblios,
     );
-}
 
-sub ShowTemplate {
-    $template->param (
-    newshelf => $newshelf||0,
-    authorized	=> $authorized,
-    errcode		=> $errcode,
-    OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'),
+    $template->param(
+        newshelf => $newshelf || 0,
+        OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'),
     );
-    output_html_with_http_headers $query, $cookie, $template->output;
 }
+$template->param( authorized => $authorized, errcode => $errcode, );
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };