From 8f85061a6698287344ca2640991000dafdd9d034 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 5 Apr 2012 15:40:46 +1200
Subject: [PATCH] Bug 6679 : Fixing some perlcritic violations in the opac

---
 opac/opac-search.pl      |    2 +-
 opac/opac-showmarc.pl    |    2 +-
 opac/opac-showreviews.pl |    6 ++++--
 opac/opac-tags.pl        |    2 +-
 opac/opac-topissues.pl   |    3 ++-
 opac/unapi               |    2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index ea0cb98..12e0067 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -406,7 +406,7 @@ my @results;
 my $lang = C4::Templates::getlanguage($cgi, 'opac');
 ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
 
-sub _input_cgi_parse ($) { 
+sub _input_cgi_parse { 
     my @elements;
     for my $this_cgi ( split('&',shift) ) {
         next unless $this_cgi;
diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index aec114b..3638f88 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -27,7 +27,7 @@
 use strict;
 use warnings;
 
-use open OUT=>':utf8', ':std';
+use open OUT=> ":encoding(UTF-8)", ':std';
 
 # standard or CPAN modules used
 use CGI;
diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index f8fc619..1ec5e59 100755
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -146,7 +146,8 @@ for my $result (@$reviews){
                     # the page number for this page
                     my $this_page_number = $i;
                     # it should only be highlighted if it's the current page
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
+                    my $highlight;
+		    $highlight = 1 if ($this_page_number == $current_page_number);
                     # put it in the array
                     push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight };
 
@@ -158,7 +159,8 @@ for my $result (@$reviews){
                 for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) {
                     my $this_offset = ((($i-9)*$results_per_page)-$results_per_page);
                     my $this_page_number = $i-9;
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
+                    my $highlight;
+		    $highlight = 1 if ($this_page_number == $current_page_number);
                     if ($this_page_number <= $pages) {
                         push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight };
                     }
diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
index 0953f82..36bc096 100755
--- a/opac/opac-tags.pl
+++ b/opac/opac-tags.pl
@@ -52,7 +52,7 @@ my $perBibResults = {};
 # Indexes of @errors that do not apply to a particular biblionumber.
 my @globalErrorIndexes = ();
 
-sub ajax_auth_cgi ($) {     # returns CGI object
+sub ajax_auth_cgi {     # returns CGI object
 	my $needed_flags = shift;
 	my %cookies = fetch CGI::Cookie;
 	my $input = CGI->new;
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 05b7a27..00ebca5 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -146,7 +146,8 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
 } else {
     my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac');
         for my $thisitemtype (@$advsearchtypes) {
-                my $selected = 1 if $thisitemtype->{authorised_value} eq $itemtype;
+                my $selected;
+	        $selected = 1 if $thisitemtype->{authorised_value} eq $itemtype;
                 my %row =( value => $thisitemtype->{authorised_value},
                 selected    => $thisitemtype eq $itemtype,
                 description => $thisitemtype->{'lib'},
diff --git a/opac/unapi b/opac/unapi
index fef5f91..0f97ece 100755
--- a/opac/unapi
+++ b/opac/unapi
@@ -44,7 +44,7 @@ use XML::LibXML;
 use XML::LibXSLT;
 
 my $cgi = CGI->new();
-binmode(STDOUT, "utf8"); #output as utf8
+binmode(STDOUT, ":encoding(UTF-8)"); #output as utf8
 
 =head1 VARIABLES
 
-- 
1.7.5.4