X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=labels%2Flabel-print.pl;h=ced9e82c282a294399487b1c6d54a593ab43ad7e;hb=091d6c513bcbee224ff06477e79be48cea7fe825;hp=b65c7a6c55a7b4be75915b540e5d5f4d66bc31ec;hpb=130e3d9c108fb35955ab9a9944e16946537aafe9;p=koha.git

diff --git a/labels/label-print.pl b/labels/label-print.pl
index b65c7a6c55..ced9e82c28 100755
--- a/labels/label-print.pl
+++ b/labels/label-print.pl
@@ -4,23 +4,23 @@
 #
 # 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;
 
-use CGI;
+use CGI qw ( -utf8 );
 use Data::Dumper;
 
 use C4::Auth qw(get_template_and_user);
@@ -31,7 +31,7 @@ use C4::Labels::Batch;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-print.tmpl",
+        template_name   => "labels/label-print.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
@@ -42,14 +42,14 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 my $op = $cgi->param('op') || 'none';
 my @label_ids;
-@label_ids = $cgi->param('label_id') if $cgi->param('label_id');   # this will handle individual label printing
+@label_ids = $cgi->multi_param('label_id') if $cgi->param('label_id');   # this will handle individual label printing
 my @batch_ids;
-@batch_ids = $cgi->param('batch_id') if $cgi->param('batch_id');
+@batch_ids = $cgi->multi_param('batch_id') if $cgi->param('batch_id');
 my $layout_id = $cgi->param('layout_id') || undef;
 my $template_id = $cgi->param('template_id') || undef;
 my $start_label = $cgi->param('start_label') || 1;
 my @item_numbers;
-@item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
+@item_numbers = $cgi->multi_param('item_number') if $cgi->param('item_number');
 my $output_format = $cgi->param('output_format') || 'pdf';
 my $referer = $cgi->param('referer') || undef;
 
@@ -115,8 +115,8 @@ elsif ($op eq 'none') {
     @batch_ids = map{{batch_id => $_}} @batch_ids;
     @label_ids = map{{label_id => $_}} @label_ids;
     @item_numbers = map{{item_number => $_}} @item_numbers;
-    $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"');
-    $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"');
+    $templates = get_all_templates( { fields => [ qw( template_id template_code ) ], filters => { creator => "Labels" }, orderby => 'template_code' } );
+    $layouts = get_all_layouts( { fields => [ qw( layout_id layout_name ) ], filters => { creator => "Labels" }, orderby => 'layout_name' } );
     $output_formats = get_output_formats();
     $template->param(
                     batch_ids                   => \@batch_ids,