X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FReports.pm;h=ef1f00417eb50400204046de01adf48ae13dc795;hb=eded6edacc5e3bf8dd0be21ed05842c3b78aadce;hp=104858e750ebb6e228f1216d38997b01bda863c4;hpb=3ce542ce2668770a5669d2fb98b666f42a5bd388;p=koha-ffzg.git diff --git a/C4/Reports.pm b/C4/Reports.pm index 104858e750..ef1f00417e 100644 --- a/C4/Reports.pm +++ b/C4/Reports.pm @@ -4,33 +4,29 @@ package C4::Reports; # # 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 . -use strict; -#use warnings; FIXME - Bug 2505 -use CGI; +use Modern::Perl; +use CGI qw ( -utf8 ); -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); use C4::Context; -use C4::Debug; +our (@ISA, @EXPORT_OK); BEGIN { - # set the version for version checking - $VERSION = 3.07.00.049; require Exporter; @ISA = qw(Exporter); - @EXPORT = qw( + @EXPORT_OK = qw( GetDelimiterChoices ); } @@ -59,7 +55,7 @@ sub GetDelimiterChoices { my $sth = $dbh->prepare(" SELECT options, value FROM systempreferences - WHERE variable = 'delimiter' + WHERE variable = 'CSVDelimiter' "); $sth->execute(); @@ -67,13 +63,10 @@ sub GetDelimiterChoices { my ($choices, $default) = $sth->fetchrow; my @dels = split /\|/, $choices; - return CGI::scrolling_list( - -name => 'sep', - -id => 'sep', - -default => $default, - -values => \@dels, - -size => 1, - -multiple => 0 ); + return { + values => \@dels, + default => $default, + }; } 1;