Merge remote-tracking branch 'origin/new/bug_8585'

[koha.git] / tools / picture-upload.pl

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index d21b6b0..4507fa1 100755 (executable)
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -58,7 +58,7 @@ $debug and warn "Params are: filetype=$filetype, cardnumber=$cardnumber, borrowe
 
 =head1 NAME
 
-picture-upload.p. - Script for handling uploading of both single and bulk patronimages and importing them into the database.
+picture-upload.pl - Script for handling uploading of both single and bulk patronimages and importing them into the database.
 
 =head1 SYNOPSIS
 
@@ -78,7 +78,10 @@ my ( $total, $handled, @counts, $tempfile, $tfh );
 if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these operational values as the template must use case to be visually pleasing!
     my $dirname = File::Temp::tempdir( CLEANUP => 1);
     $debug and warn "dirname = $dirname";
-    my $filesuffix = $1 if $uploadfilename =~ m/(\..+)$/i;
+    my $filesuffix;
+    if ( $uploadfilename =~ m/(\..+)$/i ) {
+        $filesuffix = $1;
+    }
     ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 );
     $debug and warn "tempfile = $tempfile";
     my ( @directories, $errors );
@@ -95,7 +98,7 @@ if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these ope
         }
         close $tfh;
         if ( $filetype eq 'zip' ) {
-            unless (system("unzip $tempfile -d $dirname") == 0) {
+            unless (system("unzip", $tempfile,  '-d', $dirname) == 0) {
                 $errors{'UZIPFAIL'} = $uploadfilename;
                $template->param( ERRORS => [ \%errors ] );
                 output_html_with_http_headers $input, $cookie, $template->output;   # This error is fatal to the import, so bail out here
@@ -254,8 +257,11 @@ sub handle_file {
                                        undef $srcimage;    # This object can get big...
                                }
                                $debug and warn "Image is of mimetype $mimetype";
-                               my $dberror = PutPatronImage($cardnumber,$mimetype, $imgfile) if $mimetype;
-                               if ( !$dberror && $mimetype ) { # Errors from here on are fatal only to the import of a particular image, so don't bail, just note the error and keep going
+                my $dberror;
+                if ($mimetype) {
+                    $dberror = PutPatronImage( $cardnumber, $mimetype, $imgfile );
+                }
+                if ( !$dberror && $mimetype ) { # Errors from here on are fatal only to the import of a particular image, so don't bail, just note the error and keep going
                                        $count{count}++;
                                        push @{ $count{filenames} }, { source => $filename, cardnumber => $cardnumber };
                                } elsif ( $dberror ) {
@@ -296,8 +302,6 @@ sub handle_file {
     return (%count);
 }
 
-=back
-
 =head1 AUTHORS
 
 Original contributor(s) undocumented