Original release 20160104

[fex.git] / cgi-bin / fop

diff --git a/cgi-bin/fop b/cgi-bin/fop
index fb37261f075b9b62a17c7b9869418f4c5828eebd..dec3abc0fe9c45192e62166f78962e9984a92feb 100755 (executable)
--- a/cgi-bin/fop
+++ b/cgi-bin/fop
@@ -7,6 +7,7 @@
 
 BEGIN { ($ENV{PERLINIT}||'') =~ /(.+)/s and eval $1 }
 
 
 BEGIN { ($ENV{PERLINIT}||'') =~ /(.+)/s and eval $1 }
 

+use utf8;

 use Fcntl              qw':flock :seek';
 use Cwd                        qw'abs_path';
 use File::Basename;
 use Fcntl              qw':flock :seek';
 use Cwd                        qw'abs_path';
 use File::Basename;


@@ -552,19 +553,18 @@ if (-f $data) {
       and not($dkey and ($ENV{HTTP_COOKIE}||'') =~ /dkey=$dkey/)
       and open $file,'<',"$file/download")
   {
       and not($dkey and ($ENV{HTTP_COOKIE}||'') =~ /dkey=$dkey/)
       and open $file,'<',"$file/download")
   {

-    $_ = <$file> || '';
+    my $d1 = <$file> || ''; # first download
+    chomp $d1;

     close $file;
     close $file;

-    chomp;

     if ($ra) {
       # allow downloads from same ip
     if ($ra) {
       # allow downloads from same ip

-      $_ = '' if /\Q$ra/;
+      $d1 = '' if $d1 =~ /\Q$ra/;

       # allow downloads from sender ip
       # allow downloads from sender ip

-      $_ = '' if (readlink("$file/ip")||'') eq $ra;
+      $d1 = '' if (readlink("$file/ip")||'') eq $ra;

     }
     }

-    if ($_) {
-      s/(.+) ([\w.:]+)$/by $2 at $1/;
+    if ($d1 and $d1 =~ s/(.+) ([\w.:]+)$/$2 at $1/) {

       $file = filename($file);
       $file = filename($file);

-      http_die("$file has already been downloaded $_");
+      http_die("$file has already been downloaded by $d1");

     }
   }
   $sb = sendfile($file,$seek,$stop);
     }
   }
   $sb = sendfile($file,$seek,$stop);