From dc6e1031f8c2aa36e88ca39a70c5b7d9fd63065d Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Wed, 2 Nov 2011 15:55:00 +1300 Subject: [PATCH] Bug 6679 : Adding license statement and stopping declaring variables in a conditional --- labels/label-create-csv.pl | 27 ++++++++++++++++++++++++--- t/00-testcritic.t | 4 ++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/labels/label-create-csv.pl b/labels/label-create-csv.pl index 50262df8c3..6e2263f5d3 100755 --- a/labels/label-create-csv.pl +++ b/labels/label-create-csv.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 @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 @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/t/00-testcritic.t b/t/00-testcritic.t index aad6471e4c..6018502a40 100755 --- a/t/00-testcritic.t +++ b/t/00-testcritic.t @@ -16,8 +16,8 @@ my @all_koha_dirs = qw( acqui admin authorities basket C4 catalogue cataloguing labels members misc offline_circ opac patroncards reports reserve reviews rotating_collections serials sms suggestion t tags test tools virtualshelves); -my @dirs = qw( acqui admin authorities basket catalogue cataloguing circ debian errors offline_circ reserve - reviews rotating_collections serials sms virtualshelves ); +my @dirs = qw( acqui admin authorities basket catalogue cataloguing circ debian errors labels + offline_circ reserve reviews rotating_collections serials sms virtualshelves ); if ( not $ENV{TEST_QA} ) { my $msg = 'Author test. Set $ENV{TEST_QA} to a true value to run'; -- 2.39.5