Bug 15381: Use Koha::Authority::Types in some other places

[koha.git] / admin / marc_subfields_structure.pl

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 44a9494..e6d2231 100755 (executable)
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -4,26 +4,29 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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; FIXME - Bug 2505
 use C4::Output;
 use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 
+use Koha::Authority::Types;
+
+use List::MoreUtils qw( uniq );
 
 sub string_search {
     my ( $searchstring, $frameworkcode ) = @_;
@@ -138,14 +141,7 @@ if ( $op eq 'add_form' ) {
     push( @authorised_values, "cn_source" );
 
     # build thesaurus categories list
-    $sth2->finish;
-    $sth2 = $dbh->prepare("select authtypecode from auth_types");
-    $sth2->execute;
-    my @authtypes;
-    push @authtypes, "";
-    while ( ( my $authtypecode ) = $sth2->fetchrow_array ) {
-        push @authtypes, $authtypecode;
-    }
+    my @authtypes = uniq( "", map { $_->authtypecode } Koha::Authority::Types->search );
 
     # build value_builder list
     my @value_builder = ('');
@@ -154,14 +150,15 @@ if ( $op eq 'add_form' ) {
     # 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
     # on a standard install, /cgi-bin need to be added.
     # test one, then the other
-    my $cgidir = C4::Context->intranetdir . "/cgi-bin";
+    my $cgidir = C4::Context->config('intranetdir') . "/cgi-bin";
     unless ( opendir( DIR, "$cgidir/cataloguing/value_builder" ) ) {
-        $cgidir = C4::Context->intranetdir;
+        $cgidir = C4::Context->config('intranetdir');
         opendir( DIR, "$cgidir/cataloguing/value_builder" )
           || die "can't opendir $cgidir/value_builder: $!";
     }
     while ( my $line = readdir(DIR) ) {
-        if ( $line =~ /\.pl$/ ) {
+        if ( $line =~ /\.pl$/ &&
+             $line !~ /EXAMPLE\.pl$/ ) { # documentation purposes
             push( @value_builder, $line );
         }
     }
@@ -428,8 +425,7 @@ elsif ( $op eq 'add_validate' ) {
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
 
-    print
-"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
+    print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&amp;frameworkcode=$frameworkcode");
     exit;
 
     # END $OP eq ADD_VALIDATE
@@ -471,10 +467,8 @@ elsif ( $op eq 'delete_confirmed' ) {
     }
     $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
     $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
-    print
-"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
+    print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&amp;frameworkcode=$frameworkcode");
     exit;
-    $template->param( tagfield => $tagfield );
 
     # END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ##################################