#
# 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 Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Auth;
+use C4::Auth qw( get_template_and_user );
use C4::Context;
-use C4::Koha;
-use C4::Languages qw(getTranslatedLanguages);
-use C4::ClassSource;
-use C4::Log;
-use C4::Output;
+use C4::Koha qw( getallthemes );
+use C4::Languages qw( getTranslatedLanguages );
+use C4::ClassSource qw( GetClassSources GetClassSource );
+use C4::Output qw( output_html_with_http_headers );
use C4::Templates;
-use C4::Budgets qw(GetCurrency);
-use File::Spec;
+use Koha::Acquisition::Currencies;
+use Koha::Database::Columns;
use IO::File;
-use YAML::Syck qw();
-use List::MoreUtils qw(any);
-$YAML::Syck::ImplicitTyping = 1;
-$YAML::Syck::ImplicitUnicode = 1;
-our $lang;
-
-# use Smart::Comments;
-#
+use YAML::XS;
+use Encode;
+use List::MoreUtils qw( any );
sub GetTab {
my ( $input, $tab ) = @_;
my $tab_template = C4::Templates::gettemplate( 'admin/preferences/' . $tab . '.pref', 'intranet', $input );
- my $active_currency = GetCurrency();
+ my $active_currency = Koha::Acquisition::Currencies->get_active;
my $local_currency;
if ($active_currency) {
- $local_currency = $active_currency->{currency};
+ $local_currency = $active_currency->currency;
}
$tab_template->param(
local_currency => $local_currency, # currency code is used, because we do not know how a given currency is formatted.
);
- return YAML::Syck::Load( $tab_template->output() );
+ return YAML::XS::Load( Encode::encode_utf8($tab_template->output()));
}
sub _get_chunk {
my $name = $options{'pref'};
my $chunk = { name => $name, value => $value, type => $options{'type'} || 'input', class => $options{'class'} };
+ if( $options{'syntax'} ){
+ $chunk->{'syntax'} = $options{'syntax'};
+ }
+
+ if( $options{'type'} && $options{'type'} eq 'modalselect' ){
+ $chunk->{'source'} = $options{'source'};
+ $chunk->{'exclusions'} = $options{'exclusions'} // "";
+ $chunk->{'required'} = $options{'required'} // "";
+ $chunk->{'type'} = 'modalselect';
+ }
if ( $options{'class'} && $options{'class'} eq 'password' ) {
$chunk->{'input_type'} = 'password';
+ } elsif ( $options{'class'} && $options{'class'} eq 'email' ) {
+ $chunk->{'input_type'} = 'email';
} elsif ( $options{'class'} && $options{'class'} eq 'date' ) {
$chunk->{'dateinput'} = 1;
} elsif ( $options{'type'} && ( $options{'type'} eq 'opac-languages' || $options{'type'} eq 'staff-languages' ) ) {
$interface = 'opac';
$theme = C4::Context->preference('opacthemes');
} else {
- # this is the staff client
+ # this is the staff interface
$interface = 'intranet';
$theme = C4::Context->preference('template');
}
- $chunk->{'languages'} = getTranslatedLanguages( $interface, $theme, $lang, $current_languages );
+ $chunk->{'languages'} = getTranslatedLanguages( $interface, $theme, undef, $current_languages );
$chunk->{'type'} = 'languages';
} elsif ( $options{ 'choices' } ) {
+ my $add_blank;
if ( $options{'choices'} && ref( $options{ 'choices' } ) eq '' ) {
if ( $options{'choices'} eq 'class-sources' ) {
my $sources = GetClassSources();
$options{'choices'} = { map { $_ => $_ } getallthemes( 'opac' ) }
} elsif ( $options{'choices'} eq 'staff-templates' ) {
$options{'choices'} = { map { $_ => $_ } getallthemes( 'intranet' ) }
+ } elsif ( $options{choices} eq 'patron-categories' ) {
+ $options{choices} = { map { $_->categorycode => $_->description } Koha::Patron::Categories->search->as_list };
+ $add_blank = 1;
} else {
die 'Unrecognized source of preference values: ' . $options{'choices'};
}
$value ||= 0;
- $chunk->{'type'} = 'select';
+ $chunk->{'type'} = ( $options{class} && $options{class} eq 'multiple' ) ? 'multiple' : 'select';
+
+ my @values;
+ @values = split /,/, $value if defined($value);
$chunk->{'CHOICES'} = [
sort { $a->{'text'} cmp $b->{'text'} }
- map { { text => $options{'choices'}->{$_}, value => $_, selected => ( $_ eq $value || ( $_ eq '' && ( $value eq '0' || !$value ) ) ) } }
+ map {
+ my $c = $_;
+ {
+ text => $options{'choices'}->{$c},
+ value => $c,
+ selected => (
+ grep { $_ eq $c || ( $c eq '' && ($value eq '0' || !$value ) ) } @values
+ ) ? 1 : 0,
+ }
+ }
keys %{ $options{'choices'} }
];
+
+ # Add a first blank value if needed
+ unshift @{ $chunk->{CHOICES} }, {
+ text => '',
+ value => '',
+ } if $add_blank && $chunk->{type} eq 'select';
+
} elsif ( $options{'multiple'} ) {
- my @values = split /,/, $value;
+ my @values;
+ @values = split /,/, $value if defined($value);
$chunk->{type} = 'multiple';
$chunk->{CHOICES} = [
sort { $a->{'text'} cmp $b->{'text'} }
{
text => $options{multiple}->{$option_value},
value => $option_value,
- selected => grep /^$option_value$/, @values,
+ selected => (grep { $_ eq $option_value } @values) ? 1 : 0,
}
}
keys %{ $options{multiple} }
foreach my $line ( @{ $tab->{ $group } } ) {
my @chunks;
my @names;
+ my @warnings;
foreach my $piece ( @$line ) {
if ( ref ( $piece ) eq 'HASH' ) {
# No highlighting of inputs yet, but would be useful
$chunk->{'highlighted'} = 1 if ( $searchfield && $name =~ /^$searchfield$/i );
+ if ( $name eq 'Pseudonymization' && ! C4::Context->config('bcrypt_settings')) {
+ push @warnings, 'bcrypt_config_not_set';
+ $chunk->{disabled} = 1 unless $value; # Let disable if enabled
+ }
push @chunks, $chunk;
my $name_entry = { name => $name };
}
}
$name_entry->{'overridden'} = 1 if ( any { $name eq $_ } @override_syspref_names );
+
push @names, $name_entry;
} else {
push @chunks, $piece;
}
} else {
+ if ( $piece ) {
+ my $version = Koha::version();
+ my ( $major, $minor, $maintenance, $development ) = split( '\.', $version );
+ if ( $minor % 2 ) {
+ $piece =~ s|__VERSION__|${major}_${minor}|g;
+ } else {
+ $piece =~ s|__VERSION__|master|g;
+ }
+ }
push @chunks, { type_text => 1, contents => $piece };
}
}
- push @lines, { CHUNKS => \@chunks, NAMES => \@names, is_group_title => 0 };
+ push @lines, { CHUNKS => \@chunks, NAMES => \@names, WARNINGS => \@warnings, is_group_title => 0 };
}
}
foreach my $file ( glob( "$htdocs/$theme/$lang/modules/admin/preferences/*.pref" ) ) {
my ( $tab ) = ( $file =~ /([a-z0-9_-]+)\.pref$/ );
- $results{$tab} = $open_files ? new IO::File( $file, 'r' ) : '';
+ $results{$tab} = $open_files ? IO::File->new( $file, 'r' ) : '';
}
return %results;
my %tab_files = _get_pref_files( $input );
our @terms = split( /\s+/, $searchfield );
- foreach my $tab_name ( keys %tab_files ) {
- my $data = GetTab( $input, $tab_name );
+ foreach my $tab_name ( sort keys %tab_files ) {
+ # FIXME Hum?
+ # Force list context to remove 'uninitialized value in goto' warn coming from YAML::Syck; note that the other GetTab call is in list context too. The actual cause however is the null value for the pref OpacRenewalBranch in opac.pref
+ my ($data) = GetTab( $input, $tab_name );
my $title = ( keys( %$data ) )[0];
my $tab = $data->{ $title };
$tab = { '' => $tab } if ( ref( $tab ) eq 'ARRAY' );
sub matches {
my ( $text, $terms ) = @_;
- if ( $text ) { return !grep( { $text !~ /$_/i } @$terms ); }
+ if ( $text ) {
+ return !grep(
+ {
+ my $re = eval{qr|$_|i};
+ $re = qr|\Q$_\E| if $@;
+ $text !~ m|$re|;
+ } @$terms
+ )
+ }
}
my $dbh = C4::Context->dbh;
-our $input = new CGI;
+our $input = CGI->new;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{ template_name => "admin/preferences.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
- flagsrequired => { parameters => 'parameters_remaining_permissions' },
- debug => 1,
+ flagsrequired => { parameters => 'manage_sysprefs' },
}
);
-$lang = $template->param( 'lang' );
my $op = $input->param( 'op' ) || '';
my $tab = $input->param( 'tab' );
-$tab ||= 'acquisitions'; # Ideally this should be "local-use" but preferences.pl
+$tab ||= 'accounting'; # Ideally this should be "local-use" but preferences.pl
# does not presently support local use preferences
my $highlighted;
if ( $op eq 'save' ) {
- unless ( C4::Context->config( 'demo' ) ) {
- foreach my $param ( $input->param() ) {
- my ( $pref ) = ( $param =~ /pref_(.*)/ );
+ foreach my $param ( $input->param() ) {
+ my ( $pref ) = ( $param =~ /pref_(.*)/ );
- next if ( !defined( $pref ) );
+ next if ( !defined( $pref ) );
- my $value = join( ',', $input->param( $param ) );
+ my $value = join( ',', $input->param( $param ) );
- C4::Context->set_preference( $pref, $value );
- logaction( 'SYSTEMPREFERENCE', 'MODIFY', undef, $pref . " | " . $value );
- }
+ C4::Context->set_preference( $pref, $value );
}
print $input->redirect( '/cgi-bin/koha/admin/preferences.pl?tab=' . $tab );
);
}
-$template->param( TABS => \@TABS );
+$template->param(
+ TABS => \@TABS,
+ db_columns => Koha::Database::Columns->columns,
+);
output_html_with_http_headers $input, $cookie, $template->output;
projects / srvgit / blobdiff