Merge branch 'bug_9415' into 3.12-master

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

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index a28f259..54b6606 100755 (executable)
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -19,6 +19,9 @@
 #
 #
 
+#use strict;
+#use warnings; FIXME - Bug 2505
+
 use File::Temp;
 use File::Copy;
 use CGI;
@@ -55,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
 
@@ -75,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 );
@@ -92,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
@@ -109,12 +115,12 @@ if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these ope
             }
             my $results;
             foreach my $dir ( @directories ) {
-                $results = handle_dir( $dir, $filesuffix );
+                $results = handle_dir( $dir, $filesuffix, $template );
                 $handled++ if $results == 1;
             }
             $total = scalar @directories;
         } else {       #if ($filetype eq 'zip' )
-            $results = handle_dir( $dirname, $filesuffix );
+            $results = handle_dir( $dirname, $filesuffix, $template, $cardnumber, $tempfile );
             $handled = 1;
             $total = 1;
         }
@@ -151,11 +157,11 @@ if ( $borrowernumber && !$errors && !$template->param('ERRORS') ) {
 }
 
 sub handle_dir {
-    my ( $dir, $suffix ) = @_;
-    my $source;
+    my ( $dir, $suffix, $template, $cardnumber, $source ) = @_;
     $debug and warn "Entering sub handle_dir; passed \$dir=$dir, \$suffix=$suffix";
     if ($suffix =~ m/zip/i) {     # If we were sent a zip file, process any included data/idlink.txt files
-        my ( $file, $filename, $cardnumber );
+        my ( $file, $filename );
+        undef $cardnumber;
         $debug and warn "Passed a zip file.";
         opendir my $dirhandle, $dir;
         while ( my $filename = readdir $dirhandle ) {
@@ -183,20 +189,19 @@ sub handle_dir {
            $filename   =~ s/[\"\r\n\s]//g;
             $debug and warn "Cardnumber: $cardnumber Filename: $filename";
             $source = "$dir/$filename";
-            %counts = handle_file($cardnumber, $source, %counts);
+            %counts = handle_file($cardnumber, $source, $template, %counts);
         }
         close FILE;
         closedir ($dirhandle);
     } else {
-        $source = $tempfile;
-        %counts = handle_file($cardnumber, $source, %counts);
+        %counts = handle_file($cardnumber, $source, $template, %counts);
     }
 push @counts, \%counts;
 return 1;
 }
 
 sub handle_file {
-    my ($cardnumber, $source, %count) = @_;
+    my ($cardnumber, $source, $template, %count) = @_;
     $debug and warn "Entering sub handle_file; passed \$cardnumber=$cardnumber, \$source=$source";
     $count{filenames} = () if !$count{filenames};
     $count{source} = $source if !$count{source};
@@ -210,7 +215,7 @@ sub handle_file {
         }
         $debug and warn "Source: $source";
         my $size = (stat($source))[7];
-            if ($size > 200000) {    # This check is necessary even with image resizing to avoid possible security/performance issues...
+            if ($size > 550000) {    # This check is necessary even with image resizing to avoid possible security/performance issues...
                 $filerrors{'OVRSIZ'} = 1;
                 push my @filerrors, \%filerrors;
                 push @{ $count{filenames} }, { filerrors => \@filerrors, source => $filename, cardnumber => $cardnumber };
@@ -251,8 +256,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 ) {
@@ -293,8 +301,6 @@ sub handle_file {
     return (%count);
 }
 
-=back
-
 =head1 AUTHORS
 
 Original contributor(s) undocumented