#
# 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 C4::Koha;
+use Koha::Authority::Types;
+
+use List::MoreUtils qw( uniq );
sub string_search {
my ($searchstring,$authtypecode)=@_;
my $script_name = "/cgi-bin/koha/admin/auth_subfields_structure.pl";
my ($template, $borrowernumber, $cookie) = get_template_and_user(
- { template_name => "admin/auth_subfields_structure.tmpl",
+ { template_name => "admin/auth_subfields_structure.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
push @kohafields, "auth_header.".$field;
}
- # build authorised value list
- $sth2 = $dbh->prepare("select distinct category from authorised_values");
- $sth2->execute;
- my @authorised_values;
- push @authorised_values,"";
- while ((my $category) = $sth2->fetchrow_array) {
- push @authorised_values, $category;
- }
- push (@authorised_values,"branches");
- push (@authorised_values,"itemtypes");
-
- # build thesaurus categories list
- $sth2 = $dbh->prepare("select authtypecode from auth_types");
- $sth2->execute;
- my @authtypes;
- push @authtypes, "";
- while ( ( my $authtypecode ) = $sth2->fetchrow_array ) {
- push @authtypes, $authtypecode;
- }
+ # build authorised value list
+ my $authorised_values = C4::Koha::GetAuthorisedValueCategories;
+ unshift @$authorised_values, '';
+ push @$authorised_values, 'branches';
+ push @$authorised_values, 'itemtypes';
+
+ # build thesaurus categories list
+ my @authtypes = uniq( "", map { $_->authtypecode } Koha::Authority::Types->search );
# build value_builder list
my @value_builder=('');
# 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$/) {
- push (@value_builder,$line);
+ if ( $line =~ /\.pl$/ &&
+ $line !~ /EXAMPLE\.pl$/ ) { # documentation purposes
+ push (@value_builder,$line);
}
}
@value_builder= sort {$a cmp $b} @value_builder;
id => "ohidden$i",
default => $data->{'hidden'}
};
- #$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
- # -id=>"ihidden$i",
- # -values=>['0','1','2'],
- # -labels => {'0'=>'Show','1'=>'Show Collapsed',
- # '2' =>'Hide',
- # },
- # -default=>substr($data->{'hidden'},1,1),
- # -size=>1,
- # -multiple=>0,
- # );
- #$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
- # -id=>"ehidden$i",
- # -values=>['0','1','2'],
- # -labels => {'0'=>'Show','1'=>'Show Collapsed',
- # '2' =>'Hide',
- # },
- # -default=>substr($data->{'hidden'}." ",2,1),
- # -size=>1,
- # -multiple=>0,
- # );
$row_data{tagsubfieldinput} = "<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
$row_data{tagsubfield} = $data->{'tagsubfield'};
$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
- $row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
- -id=>"kohafield$i",
- -values=> \@kohafields,
- -default=> "$data->{'kohafield'}",
- -size=>1,
- -multiple=>0,
- );
- $row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value',
- -id=>"authorised_value$i",
- -values=> \@authorised_values,
- -default=>$data->{'authorised_value'},
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
- $row_data{frameworkcode} = CGI::scrolling_list(-name=>'frameworkcode',
- -id=>"frameworkcode$i",
- -values=> \@authtypes,
- -default=>$data->{'frameworkcode'},
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
- $row_data{value_builder} = CGI::scrolling_list(-name=>'value_builder',
- -id=>"value_builder$i",
- -values=> \@value_builder,
- -default=>$data->{'value_builder'},
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
+ $row_data{kohafield} = {
+ id => "kohafield$i",
+ values => \@kohafields,
+ default => "$data->{'kohafield'}",
+ };
+ $row_data{authorised_value} = {
+ id => "authorised_value$i",
+ values => $authorised_values,
+ default => $data->{'authorised_value'},
+ };
+ $row_data{frameworkcode} = {
+ id => "frameworkcode$i",
+ values => \@authtypes,
+ default => $data->{'frameworkcode'},
+ };
+ $row_data{value_builder} = {
+ id => "value_builder$i",
+ values => \@value_builder,
+ default => $data->{'value_builder'},
+ };
$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-checked => $data->{'repeatable'}?'checked':'',
for (my $i=1;$i<=$more_subfields;$i++) {
my %row_data; # get a fresh hash for the row data
$row_data{'new_subfield'} = 1;
- $row_data{tab} = CGI::scrolling_list(-name=>'tab',
- -id => "tab$i",
- -values =>
- [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
- -labels => {
- '-1' => 'ignore',
- '0' => '0',
- '1' => '1',
- '2' => '2',
- '3' => '3',
- '4' => '4',
- '5' => '5',
- '6' => '6',
- '7' => '7',
- '8' => '8',
- '9' => '9',
- },
- -default=>"",
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
- $row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
- -id=>"ohidden$i",
- #-values=>['0','1','2'],
- #-labels => {'0'=>'Show','1'=>'Show Collapsed',
- # '2' =>'Hide',
- # },
- -values=>['0','-5'],
- -labels => {'0'=>'Show All','-5'=>'Hide All',},
- #-default=>"0",
- -default=>$data->{'hidden'},
- #-default=>"-5",
- -size=>1,
- -multiple=>0,
- );
+ $row_data{tab} = {
+ id => "tab$i",
+ default => $data->{'tab'},
+ };
+ $row_data{ohidden} = {
+ id => "ohidden$i",
+ default => $data->{'hidden'}
+ };
- #$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
- # -id=>"ihidden$i",
- # -values=>['0','1','2'],
- # -labels => {'0'=>'Show','1'=>'Show Collapsed',
- # '2' =>'Hide',
- # },
- # -default=>"0",
- # -size=>1,
- # -multiple=>0,
- # );
- #$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
- # -id=>"ehidden$i",
- # -values=>['0','1','2'],
- # -labels => {'0'=>'Show','1'=>'Show Collapsed',
- # '2' =>'Hide',
- # },
- # -default=>"0",
- # -size=>1,
- # -multiple=>0,
- # );
$row_data{tagsubfieldinput} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
$row_data{tagsubfieldinput} =
"<label><input type=\"text\" name=\"tagsubfield\" value=\""
-checked => '',
-value => 1,
-label => '');
- $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
- -id => "kohafield$i",
- -values=> \@kohafields,
- -default=> "",
- -size=>1,
- -multiple=>0,
- );
- $row_data{frameworkcode} = CGI::scrolling_list(-name=>'frameworkcode',
- -id=>'frameworkcode',
- -values=> \@authtypes,
- -default=>$data->{'frameworkcode'},
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
- $row_data{authorised_value} = CGI::scrolling_list(-name=>'authorised_value',
- -id => 'authorised_value',
- -values=> \@authorised_values,
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
- $row_data{value_builder} = CGI::scrolling_list(-name=>'value_builder',
- -id=>'value_builder',
- -values=> \@value_builder,
- -default=>$data->{'value_builder'},
- -size=>1,
- -tabindex=>'',
- -multiple=>0,
- );
+ $row_data{kohafield} = {
+ id => "kohafield$i",
+ values => \@kohafields,
+ default => "",
+ };
+ $row_data{authorised_value} = {
+ id => "authorised_value",
+ values => $authorised_values,
+ default => "",
+ };
+ $row_data{frameworkcode} = {
+ id => "frameworkcode",
+ values => \@authtypes,
+ default => $data->{'frameworkcode'},
+ };
+ $row_data{value_builder} = {
+ id => "value_builder",
+ values => \@value_builder,
+ default => $data->{'value_builder'},
+ };
+
$row_data{row} = $i;
push(@loop_data, \%row_data);
}
my @kohafield = ''.$input->param('kohafield');
my @tab = $input->param('tab');
my @seealso = $input->param('seealso');
- my @hidden;
my @ohidden = $input->param('ohidden');
#my @ihidden = $input->param('ihidden');
#my @ehidden = $input->param('ehidden');
}
}
}
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
- exit;
+ print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode");
+ exit;
# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
$sth->execute($tagfield,$tagsubfield,$authtypecode);
}
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
- exit;
- $template->param(tagfield => $tagfield);
+ print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode");
+ exit;
# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
projects / koha.git / blobdiff