From 6bb73a04c4c67e5b14eb209ec56ae6585547c593 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 2 Nov 2011 16:00:01 +1300
Subject: [PATCH] Bug 6679 : Declare variables outside of conditionals

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 labels/label-create-pdf.pl | 10 ++++++----
 labels/label-create-xml.pl | 27 ++++++++++++++++++++++++---
 labels/label-edit-batch.pl |  9 ++++++---
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl
index d45b5615cd..106b37d741 100755
--- a/labels/label-create-pdf.pl
+++ b/labels/label-create-pdf.pl
@@ -38,13 +38,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
 								     debug           => 1,
 								     });
 
-
-my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
+my $batch_id;
+my @label_ids;
+my @item_numbers;
+$batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
 my $template_id = $cgi->param('template_id') || undef;
 my $layout_id   = $cgi->param('layout_id') || undef;
 my $start_label = $cgi->param('start_label') || 1;
-my @label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
-my @item_numbers  = $cgi->param('item_number') if $cgi->param('item_number');
+@label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
+@item_numbers  = $cgi->param('item_number') if $cgi->param('item_number');
 
 my $items = undef;
 
diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl
index dd83f1d020..7b108ce32c 100755
--- a/labels/label-create-xml.pl
+++ b/labels/label-create-xml.pl
@@ -1,5 +1,23 @@
 #!/usr/bin/perl
 
+# Copyright Koha development team 2011
+#
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+#
+
 use strict;
 use warnings;
 
@@ -13,11 +31,14 @@ use C4::Labels 1.000000;
 
 my $cgi = new CGI;
 
-my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
+my $batch_id;
+my @labels_id;
+my @item_numbers;
+$batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
 my $template_id = $cgi->param('template_id') || undef;
 my $layout_id   = $cgi->param('layout_id') || undef;
-my @label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
-my @item_numbers  = $cgi->param('item_number') if $cgi->param('item_number');
+@label_ids   = $cgi->param('label_id') if $cgi->param('label_id');
+@item_numbers  = $cgi->param('item_number') if $cgi->param('item_number');
 
 my $items = undef;
 
diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 8740c573de..fbcfe0a277 100755
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -56,10 +56,13 @@ my $display_columns = [ {_label_number  => {label => 'Label Number', link_field
                         {select         => {label => 'Select', value => '_label_id'}},
                       ];
 my $op = $cgi->param('op') || 'edit';
+my @label_ids;
+my @item_numbers;
+my $barcode;
 my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef;
-my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');
-my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
-my $barcode = $cgi->param('barcode') if $cgi->param('barcode');
+@label_ids = $cgi->param('label_id') if $cgi->param('label_id');
+@item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
+$barcode = $cgi->param('barcode') if $cgi->param('barcode');
 
 my $branch_code = C4::Context->userenv->{'branch'};
 
-- 
2.39.5