X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=labels%2Flabel-print.pl;h=7d53c74c2f17a1e5948ae36209d4f76eabd2b780;hb=951f3346a25c7f2883f834398055c2413b8f9c9b;hp=f67c3cf379c66e60a845bb725abec22544243298;hpb=8e0b1fe58f7e4f6e595b18d43c939c203833dac1;p=srvgit

diff --git a/labels/label-print.pl b/labels/label-print.pl
index f67c3cf379..7d53c74c2f 100755
--- a/labels/label-print.pl
+++ b/labels/label-print.pl
@@ -13,9 +13,9 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 use strict;
 use warnings;
@@ -25,13 +25,13 @@ use Data::Dumper;
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use C4::Creators::Lib 1.000000 qw(get_all_templates get_all_layouts get_output_formats);
-use C4::Labels::Batch 1.000000;
+use C4::Creators::Lib qw(get_all_templates get_all_layouts get_output_formats);
+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,
@@ -41,12 +41,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $op = $cgi->param('op') || 'none';
-my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');   # this will handle individual label printing
-my @batch_ids = $cgi->param('batch_id') if $cgi->param('batch_id');
+my @label_ids;
+@label_ids = $cgi->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');
 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 = $cgi->param('item_number') if $cgi->param('item_number');
+my @item_numbers;
+@item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
 my $output_format = $cgi->param('output_format') || 'pdf';
 my $referer = $cgi->param('referer') || undef;
 
@@ -109,11 +112,11 @@ elsif ($op eq 'none') {
     # setup select menus for selecting layout and template for this run...
     $referer = $ENV{'HTTP_REFERER'};
     $referer =~ s/^.*?:\/\/.*?(\/.*)$/$1/m;
-    @batch_ids = grep{$_ = {batch_id => $_}} @batch_ids;
-    @label_ids = grep{$_ = {label_id => $_}} @label_ids;
-    @item_numbers = grep{$_ = {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"');
+    @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"', orderby => 'template_code' );
+    $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"', orderby => 'layout_name' );
     $output_formats = get_output_formats();
     $template->param(
                     batch_ids                   => \@batch_ids,