X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2Fpicture-upload.pl;h=b2aa18a89c7ce9fb21ecdec02f4ccebf6c5361a2;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=bfb233e6e25c97b540d86459d655f04291fa118c;hpb=b5b71339f3e3dfd639609ecc4b6912435d29704b;p=koha.git

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index bfb233e6e2..b2aa18a89c 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -80,7 +80,7 @@ if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these ope
     $debug and warn "dirname = $dirname";
     my $filesuffix;
     if ( $uploadfilename =~ m/(\..+)$/i ) {
-        my $filesuffix = $1;
+        $filesuffix = $1;
     }
     ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 );
     $debug and warn "tempfile = $tempfile";
@@ -115,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;
         }
@@ -146,7 +146,7 @@ if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these ope
     $template->param(cardnumber => $cardnumber);
     $template->param(filetype => $filetype);
 } elsif ( $op eq 'Delete' ) {
-    my $dberror = RmPatronImage($cardnumber);
+    my $dberror = RmPatronImage($borrowernumber);
 	$debug and warn "Patron image deleted for $cardnumber";
     warn "Database returned $dberror" if $dberror;
 }
@@ -157,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 ) {
@@ -189,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};