Bug 16497: (follow-up) GET operations require staff access

[srvgit] / opac / opac-authoritiesdetail.pl

diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index 79c70db..08d0369 100755 (executable)
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -36,23 +36,26 @@ parameters tables.
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use C4::AuthoritiesMarc;
 use C4::Auth;
+use C4::Biblio qw(GetMarcUrls);
 use C4::Context;
 use C4::Output;
 use CGI qw ( -utf8 );
 use MARC::Record;
 use C4::Koha;
 
+use Koha::Authorities;
+use Koha::Authority::Types;
 
 my $query = new CGI;
 
 my $dbh = C4::Context->dbh;
 
 my $display_hierarchy = C4::Context->preference("AuthDisplayHierarchy");
+my $marcflavour       = C4::Context->preference("marcflavour");
 my $show_marc = $query->param('marc');
 
 # open template
@@ -74,29 +77,26 @@ if ( ! $record ) {
     exit;
 }
 
-my $authtypecode = &GetAuthTypeCode( $authid );
+my $authority = Koha::Authorities->find( $authid );
+my $authtypecode = $authority ? $authority->authtypecode : q{};
 
 if ($display_hierarchy){
     $template->{VARS}->{'displayhierarchy'} = $display_hierarchy;
     $template->{VARS}->{'loophierarchies'} = GenerateHierarchy($authid);
 }
 
-my $count = CountUsage($authid);
+my $count = $authority ? $authority->get_usage_count : 0;
 
+my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypecode'] } );
+my $marcurlsarray = GetMarcUrls( $record, $marcflavour );
 
-my $authtypes     = getauthtypes();
-my @authtypesloop = ();
-foreach my $thisauthtype ( keys %{$authtypes} ) {
-    push @authtypesloop,
-         { value        => $thisauthtype,
-           selected     => $thisauthtype eq $authtypecode,
-           authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-         };
-}
-$template->{VARS}->{'authtypesloop'} = \@authtypesloop;
-$template->{VARS}->{'authtypetext'}  = $authtypes->{$authtypecode}{'authtypetext'};
-$template->{VARS}->{'authid'}        = $authid;
-$template->{VARS}->{'count'}         = $count;
+$template->param(
+    authority_types => $authority_types,
+    authtypetext    => $authority_types->find($authtypecode)->authtypetext,
+    authid          => $authid,
+    count           => $count,
+    MARCURLS        => $marcurlsarray,
+);
 
 # find the marc field/subfield used in biblio by this authority
 if ($show_marc) {
@@ -122,7 +122,7 @@ if ($show_marc) {
         my @subfields_data;
 
 # skip UNIMARC fields <200, they are useless for a patron
-        next if C4::Context->preference('marcflavour') eq 'UNIMARC' && $field->tag() <200;
+        next if $marcflavour eq 'UNIMARC' && $field->tag() <200;
 
 # if tag <10, there's no subfield, use the "@" trick
         if ( $field->tag() < 10 ) {
@@ -134,7 +134,7 @@ if ($show_marc) {
             $subfield_data{marc_tag}      = $field->tag();
             push( @subfields_data, \%subfield_data );
         }
-        elsif ( C4::Context->preference('marcflavour') eq 'MARC21' && $field->tag() eq 667 ) {
+        elsif ( $marcflavour eq 'MARC21' && $field->tag() eq 667 ) {
             # tagfield 667 is a nonpublic general note in MARC21, which shouldn't be shown in the OPAC
         }
         else {