X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-addbybiblionumber.pl;h=004577d313fd95d2ddff05c11ed1be0d96ffe656;hb=488a3d6fed57b4e0d773157ee4a6ab7e4775e7a4;hp=fd3124b46bc4f62f6c05764b90215e82a927aacf;hpb=aef1dd15fbe37a8a9c30ba4b38f7ecd6c1fea54d;p=koha.git diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl index fd3124b46b..004577d313 100755 --- a/opac/opac-addbybiblionumber.pl +++ b/opac/opac-addbybiblionumber.pl @@ -25,110 +25,149 @@ use strict; use warnings; -use C4::Biblio; use CGI; -use C4::VirtualShelves qw/:DEFAULT GetAllShelves RefreshShelvesSummary/; -use C4::Auth; +use C4::Biblio; +use C4::VirtualShelves qw/:DEFAULT GetAllShelves/; use C4::Output; -use C4::Auth qw/get_session/; -use C4::Debug; +use C4::Auth; + +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; + +our ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "opac-addbybiblionumber.tmpl", + 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 -#splits incoming biblionumber(s) to array and adds each to shelf. sub AddBibliosToShelf { + #splits incoming biblionumber(s) to array and adds each to shelf. my ($shelfnumber,@biblionumber)=@_; - # multiple bibs might come in as '/' delimited string (from where, i don't see), or as array. + #multiple bibs might come in as '/' delimited string (from where, i don't see), or as array. if (scalar(@biblionumber) == 1) { @biblionumber = (split /\//,$biblionumber[0]); } - for my $bib (@biblionumber){ - AddToShelf($bib, $shelfnumber); + for my $bib (@biblionumber) { + AddToShelf($bib, $shelfnumber, $loggedinuser); } } -my $query = new CGI; -my @biblionumber = $query->param('biblionumber'); -my $selectedshelf = $query->param('selectedshelf'); -my $newshelf = $query->param('newshelf'); -my $shelfnumber = $query->param('shelfnumber'); -my $newvirtualshelf = $query->param('newvirtualshelf'); -my $category = $query->param('category'); - -my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "opac-addbybiblionumber.tmpl", - query => $query, - type => "opac", - authnotrequired =>( C4::Context->preference("OpacPublic") ? 1 : 0 ), +sub HandleNewVirtualShelf { + if($authorized= ShelfPossibleAction($loggedinuser, undef, $category==1? 'new_private': 'new_public')) { + $shelfnumber = AddShelf( { + shelfname => $newvirtualshelf, + category => $category }, $loggedinuser); + if($shelfnumber == -1) { + $authorized=0; + $errcode=1; + return; + } + AddBibliosToShelf($shelfnumber, @biblionumber); + #Reload the page where you came from + print $query->header; + print ""; } -); - -if ($newvirtualshelf) { - $shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category ); - AddBibliosToShelf($shelfnumber, @biblionumber); - RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10)); - print $query->header; - print ""; - exit; } -# verify user is authorized to perform the action on the shelf... -my $authorized = 1; -if ($selectedshelf) { - $authorized = 0 unless ShelfPossibleAction( $loggedinuser, $selectedshelf ); +sub HandleShelfNumber { + if($authorized= ShelfPossibleAction($loggedinuser, $shelfnumber, 'add')) { + AddBibliosToShelf($shelfnumber,@biblionumber); + #Close this page and return + print $query->header; + print ""; + } } -if ($shelfnumber && ($shelfnumber != -1)) { - AddBibliosToShelf($shelfnumber,@biblionumber); - RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10)); - print $query->header; - print ""; - exit; +sub HandleSelectedShelf { + if($authorized= ShelfPossibleAction( $loggedinuser, $selectedshelf, 'add')){ + #adding to specific shelf + my ($singleshelf, $singleshelfname)= GetShelf($query->param('selectedshelf')); + $template->param( + singleshelf => 1, + shelfnumber => $singleshelf, + shelfname => $singleshelfname, + ); + } } -else { - if($selectedshelf){ - # adding to specific shelf - my ( $singleshelf, $singleshelfname, $singlecategory ) = GetShelf( $query->param('selectedshelf') ); - $template->param( - singleshelf => 1, - shelfnumber => $singleshelf, - shelfname => $singleshelfname, - "category$singlecategory" => 1 - ); - } else { - my $privateshelves = GetAllShelves(1,$loggedinuser); - if(@{$privateshelves}){ - $template->param ( - privatevirtualshelves => $privateshelves, - existingshelves => 1 - ); - } - my $publicshelves = GetAllShelves(2,$loggedinuser); - if(@{$publicshelves}){ - $template->param ( - publicvirtualshelves => $publicshelves, - existingshelves => 1 - ); - } +sub HandleSelect { + return unless $authorized= $loggedinuser>0; + my $privateshelves = GetAllShelves(1,$loggedinuser,1); + if(@{$privateshelves}){ + $template->param ( + privatevirtualshelves => $privateshelves, + existingshelves => 1 + ); + } + my $publicshelves = GetAllShelves(2,$loggedinuser,1); + if(@{$publicshelves}){ + $template->param ( + publicvirtualshelves => $publicshelves, + existingshelves => 1 + ); + } +} +sub LoadBib { + #see comment in AddBibliosToShelf + if (scalar(@biblionumber) == 1) { + @biblionumber = (split /\//,$biblionumber[0]); + } + for my $bib (@biblionumber) { + my $data = GetBiblioData( $bib ); + push(@biblios, + { biblionumber => $bib, + title => $data->{'title'}, + author => $data->{'author'}, + } ); + } + $template->param( + multiple => (scalar(@biblios) > 1), + total => scalar @biblios, + biblios => \@biblios, + ); } - my @biblios; - for my $bib (@biblionumber) { - my $data = GetBiblioData( $bib ); - push(@biblios, - { biblionumber => $bib, - title => $data->{'title'}, - author => $data->{'author'}, - } ); - } - $template->param ( - newshelf => $newshelf, - multiple => (scalar(@biblios) > 1), - total => scalar @biblios, - biblios => \@biblios, - authorized => $authorized, - ); - output_html_with_http_headers $query, $cookie, $template->output; +sub ShowTemplate { + $template->param ( + newshelf => $newshelf||0, + authorized => $authorized, + errcode => $errcode, + OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'), + ); + output_html_with_http_headers $query, $cookie, $template->output; }