From 1028d64f0de7ed64eeab3d73c6cea4122ed940e7 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Tue, 19 Mar 2013 10:48:08 +0100 Subject: [PATCH] Bug 6874: QA follow-up Squash of the following commits: return with explicit undef removed Follow-up for PBP fixes follow-up fix POD syntax follow-up jquery has moved Signed-off-by: Paul Poulain Signed-off-by: Jared Camins-Esakov --- C4/Biblio.pm | 18 +++++++++++------- C4/UploadedFiles.pm | 2 +- cataloguing/value_builder/upload.pl | 2 +- .../en/modules/cataloguing/value_builder/upload.tt | 2 +- opac/opac-retrieve-file.pl | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 084f965..c0a0cf3 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -1446,13 +1446,14 @@ sub GetCOinSBiblio { =head2 GetMarcPrice return the prices in accordance with the Marc format. + =cut sub GetMarcPrice { my ( $record, $marcflavour ) = @_; my @listtags; my $subfield; - + if ( $marcflavour eq "MARC21" ) { @listtags = ('345', '020'); $subfield="c"; @@ -3393,8 +3394,9 @@ sub get_biblio_authorised_values { =head2 CountBiblioInOrders -=over 4 -$count = &CountBiblioInOrders( $biblionumber); +=over + +=item $count = &CountBiblioInOrders( $biblionumber); =back @@ -3416,8 +3418,9 @@ sub CountBiblioInOrders { =head2 GetSubscriptionsId -=over 4 -$subscriptions = &GetSubscriptionsId($biblionumber); +=over + +=item $subscriptions = &GetSubscriptionsId($biblionumber); =back @@ -3439,8 +3442,9 @@ sub GetSubscriptionsId { =head2 GetHolds -=over 4 -$holds = &GetHolds($biblionumber); +=over + +=item $holds = &GetHolds($biblionumber); =back diff --git a/C4/UploadedFiles.pm b/C4/UploadedFiles.pm index 246b02b..1574e99 100644 --- a/C4/UploadedFiles.pm +++ b/C4/UploadedFiles.pm @@ -180,7 +180,7 @@ sub UploadFile { return $id; } - return undef; + return; } =head2 DelUploadedFile diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl index 0cb33f4..03ad77b 100755 --- a/cataloguing/value_builder/upload.pl +++ b/cataloguing/value_builder/upload.pl @@ -140,7 +140,7 @@ sub finddirs { my $base = shift || $upload_path; my $found = 0; my @dirs; - my @files = <$base/*>; + my @files = glob("$base/*"); foreach (@files) { if (-d $_ and -w $_) { my $lastdirname = basename($_); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt index 4fae58a..da40360 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt @@ -4,7 +4,7 @@ Upload plugin - + diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl index ddbf1ac..d5406e6 100755 --- a/opac/opac-retrieve-file.pl +++ b/opac/opac-retrieve-file.pl @@ -32,12 +32,12 @@ exit 1 if not $file; my $file_path = $file->{filepath}; if( -f $file_path ) { - open FH, '<', $file_path or die "Can't open file: $!"; + open my $fh, '<', $file_path or die "Can't open file: $!"; print $input->header( -type => "application/octet-stream", -attachment => $file->{filename} ); - while() { + while(<$fh>) { print $_; } } else { -- 1.7.2.5