X-Git-Url: http://git.treefish.org/fex.git/blobdiff_plain/e60096926213ce02293a261254ff065cae44c1c8..20150826:/cgi-bin/fup?ds=sidebyside

diff --git a/cgi-bin/fup b/cgi-bin/fup
index b1e01e6..97624a0 100755
--- a/cgi-bin/fup
+++ b/cgi-bin/fup
@@ -37,7 +37,7 @@ our (@registration_hosts,@demo,@file_link_dirs);
 our ($FEXHOME);
 our ($spooldir,$durl,$tmpdir,@logdir,$logdir,$docdir,$hostname,$admin,$fra);
 our ($keep_default,$recipient_quota,$sender_quota,$fex_yourself);
-our ($sendmail,$mdomain,$fop_auth,$mail_auth,$faillog);
+our ($sendmail,$mdomain,$fop_auth,$mail_auth,$faillog,$amdl);
 our ($dkeydir,$ukeydir,$akeydir,$skeydir,$gkeydir,$xkeydir);
 our ($MB,$DS);
 our $RB;		# read POST bytes (total)
@@ -57,7 +57,7 @@ my @header;		# HTTP entity header
 my $fileid;		# file ID
 my $captive;
 my $muser;		# main user fur sub or group user
-  
+
 # load common code, local config: $FEXLIB/fex.ph
 require "$FEXLIB/fex.pp";
 
@@ -66,7 +66,7 @@ our ($info_1,$info_2,$info_login);
 
 $locale = $ENV{LOCALE} || 'english';
 foreach (
-  "/var/lib/fex/locale/$locale/lib/fup.pl", 
+  "/var/lib/fex/locale/$locale/lib/fup.pl",
   "$FEXLIB/fup.pl",
 ) {
   if (-f) {
@@ -129,7 +129,7 @@ if ($from and $id_forgotten and $mail_authid and not ($fop_auth or $nomail)) {
 
 # public recipients? (needs no auth-ID for sender)
 if ($to and $id and $id eq 'PUBLIC' and @public_recipients) {
-  
+
   unless ($from) {
     http_die("missing sender e-mail address");
   }
@@ -146,12 +146,12 @@ if ($to and $id and $id eq 'PUBLIC' and @public_recipients) {
 }
 
 # anonymous upload from enabled IP?
-if ($from =~ /^anonymous@/ and 
+if ($from =~ /^anonymous@/ and
     @anonymous_upload and ipin($ra,@anonymous_upload)) {
   $id = $rid = $anonymous = 'anonymous';
   if ($to =~ /^anonymous/) {
     @to = ($to);
-    $autodelete{$to} = $autodelete = 'NO'; 
+    $autodelete{$to} = $autodelete = 'NO';
   }
   $nomail = $anonymous;
 }
@@ -161,7 +161,7 @@ $comment = 'NOMAIL' if $nomail and not $comment;
 # one time token
 if ($okey) {
   $to = "@to" or http_die("no recipient specified");
-  $from = readlink "$to/\@OKEY/$okey" 
+  $from = readlink "$to/\@OKEY/$okey"
     or http_die("no upload key \"<code>$okey</code>\" - ".
                 "request another one from <code>$to</code>");
   $from = untaint($from);
@@ -252,12 +252,12 @@ if ($akey and $dkey and $command eq 'COPY') {
     http_die("File not found");
   }
   if (-e "$to/$to/$file/data") {
-    http_die("File $file already exists in your outgoing spool") 
-      if (readlink("$to/$to/$file/id")||$to) ne 
+    http_die("File $file already exists in your outgoing spool")
+      if (readlink("$to/$to/$file/id")||$to) ne
          (readlink("$to/$from/$file/id")||$from);
   } else {
     mkdirp("$to/$to/$file");
-    link "$to/$from/$file/data","$to/$to/$file/data" 
+    link "$to/$from/$file/data","$to/$to/$file/data"
       or http_die("cannot link to $to/$to/$file/data - $!\n");
     copy("$to/$from/$file/filename","$to/$to/$file/filename");
     copy("$to/$from/$file/id","$to/$to/$file/id");
@@ -302,7 +302,7 @@ if ($akey and $dkey and $command eq 'DELETE') {
       ""
     );
     &reexec;
-  } else { 
+  } else {
     my $s = $!;
     http_header('404 Not Found');
     print html_header($head);
@@ -315,7 +315,7 @@ if ($akey and $dkey and $command eq 'DELETE') {
 
 # special commands
 if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
-                                                                     
+
   if ($command eq 'CHECKQUOTA') {
     http_die("illegal command \"$command\"") if $public or $anonymous;
     nvt_print('HTTP/1.1 204 OK');
@@ -390,9 +390,9 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
           $filename = <$file>;
           close $file;
         }
-        if ($filename and length $filename) { 
+        if ($filename and length $filename) {
           $filename = html_quote($filename);
-        } else { 
+        } else {
           $filename = '???';
         }
         if (open $file,'<',"$file/comment") {
@@ -401,7 +401,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
         }
         my $rkeep = untaint(readlink "$file/keep"||$keep_default)
                     - int((time-mtime("$file/filename"))/$DS);
-        if ($comment =~ /NOMAIL/ or 
+        if ($comment =~ /NOMAIL/ or
            (readlink "$to/\@NOTIFICATION"||'') =~ /^no/i) {
           printf "%8s MB [%s d] %s/%s/%s\n",
                  $size,
@@ -416,7 +416,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
                  untaint("/fup?akey=$akey&dkey=$dkey&command=RENOTIFY"),
                  $filename,
                  $comment ? qq' "$comment"' : '',
-                 $file eq $nfile ? 
+                 $file eq $nfile ?
                    " &rarr; notification e-mail has been resent" :
                    "";
         }
@@ -428,7 +428,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
       '</body></html>'
     ));
     exit;
-  } 
+  }
 
   if ($command =~ /^LIST(RECEIVED)?$/) {
     http_die("illegal command \"$command\"") if $public or $anonymous;
@@ -458,16 +458,16 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
             $filename = <$file>;
             close $file;
           }
-          if ($filename and length $filename) { 
+          if ($filename and length $filename) {
             $filename = html_quote($filename);
-          } else { 
+          } else {
             $filename = '???';
           }
           if (open $file,'<',"$file/comment") {
             $comment = untaint(html_quote(getline($file)));
             close $file;
           }
-          my $rkeep = untaint(readlink "$file/keep"||$keep_default) 
+          my $rkeep = untaint(readlink "$file/keep"||$keep_default)
                       - int((time-mtime("$file/filename"))/$DS);
           printf "%8s MB [%s d] <a href=\"%s\">%s</a>%s\n",
                  $size,
@@ -482,7 +482,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
         '<p><a href="javascript:history.back()">back to F*EX operation control</a>'
         '</body></html>'
       ));
-    } 
+    }
     # list received files
     else {
       $to = $from;
@@ -512,9 +512,9 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
               $filename = <$file>;
               close $file;
             }
-            if ($filename and length $filename) { 
+            if ($filename and length $filename) {
               $filename = html_quote($filename);
-            } else { 
+            } else {
               $filename = '???';
             }
             if (open $file,'<',"$file/comment") {
@@ -522,7 +522,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
               $comment = ' "'.$comment.'"';
               close $file;
             }
-            my $rkeep = untaint(readlink "$file/keep"||$keep_default) 
+            my $rkeep = untaint(readlink "$file/keep"||$keep_default)
                         - int((time-mtime("$file/filename"))/$DS);
             printf "[<a href=\"/fup?akey=%s&dkey=%s&command=DELETE\">delete</a>] ",
                    $akey,$dkey;
@@ -541,11 +541,11 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
       ));
     }
     exit;
-  } 
-      
+  }
+
   if ($command eq 'LISTSENT') {
     http_die("illegal command \"$command\"") if $public or $anonymous;
-    # show download URLs 
+    # show download URLs
     http_header('200 OK');
     print html_header($head);
     print "<h2>Download URLs of files you have sent\n";
@@ -571,7 +571,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
     ));
     exit;
   }
-      
+
   if ($command eq 'FOPLOG') {
     http_die("illegal command \"$command\"") if $public or $anonymous;
     if (open my $log,"$logdir/fop.log") {
@@ -588,14 +588,14 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
     }
     exit;
   }
-  
+
   if ($command eq 'RECEIVEDLOG') {
     http_die("illegal command \"$command\"") if $public or $anonymous;
     if (open my $log,"$logdir/fup.log") {
       http_header('200 OK');
       while (<$log>) {
         next if /\sSTDFEX\s/;
-        if (/\d+$/) { 
+        if (/\d+$/) {
           my @F = split;
           if ($F[5] eq $to) {
             s/ \[[\d_]+\]//;
@@ -613,7 +613,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
       http_header('200 OK');
       while (<$log>) {
         next if /\sSTDFEX\s/;
-        if (/(\S+\@\S+)/ and $1 eq $from) { 
+        if (/(\S+\@\S+)/ and $1 eq $from) {
           s/ \[[\d_]+\]//;
           print;
         }
@@ -656,7 +656,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
         http_die("illegal parameter <code>$del</code>");
       }
       $del = untaint($del);
-      
+
       if (unlink("$del/data") or unlink("$del/upload")) {
         if (open F,'>',"$del/error") {
           print F "$file has been deleted by $from\n";
@@ -665,7 +665,7 @@ if (($from and $id and $rid eq $id or $gkey or $skey) and $command) {
         http_header('200 OK',"X-File: $del");
         print html_header($head);
         print "<h3>$file deleted</h3>\n";
-      } else { 
+      } else {
         http_header("404 Not Found");
         print html_header($head);
         print "<h3>$file not deleted</h3>\n";
@@ -695,16 +695,16 @@ if ($from and $id and $rid eq $id and open my $ipr,"$from/\@UPLOAD_HOSTS") {
   }
 }
 
-# quotas 
+# quotas
 if ($from and $id and $rid eq $id and @to and not $flink and not $seek) {
   my ($quota,$du);
-  
+
   # check sender quota
   ($quota,$du) = check_sender_quota($muser||$from);
   if ($quota and $du+$cl/$MB > $quota) {
     http_die("you are overquota");
   }
-  
+
   # check recipient quota
   foreach my $to (@to) {
     ($quota,$du) = check_recipient_quota($to);
@@ -731,7 +731,7 @@ if (not $addto and $fop_auth and $id and $id eq $rid and $from and @to) {
     if (open $idf,'<',"$to/@") {
       $to_reg = getline($idf);
       close $idf;
-    } 
+    }
     # sub user?
     elsif (open $idf,'<',"$from/\@SUBUSER") {
       while (<$idf>) {
@@ -755,7 +755,7 @@ if (not $addto and $fop_auth and $id and $id eq $rid and $from and @to) {
 }
 
 $to = join(',',@to);
-  
+
 if ($to =~ /^@(.+)/) {
   if ($nomail) {
     http_die("server runs in NOMAIL mode - groups ($to) are not allowed");
@@ -788,10 +788,10 @@ if ($from and $id and $id eq $rid and $faillog) {
 # display HTML form and request user data
 unless ($file) {
 
-  if ($test) { $cgi = $test } 
+  if ($test) { $cgi = $test }
   else       { $cgi = $ENV{SCRIPT_NAME} }
   $cgi = 'fup';
-  
+
   # delete old cookies on logout referer
   my @cookies;
   if ($logout and my $cookie = $ENV{HTTP_COOKIE}) {
@@ -799,7 +799,7 @@ unless ($file) {
       push @cookies,"Set-Cookie: $1=; Max-Age=0; Discard";
     }
   }
-  
+
   if (($akey or $skey or $gkey) and $from and -d $from) {
     # save default locale for this user
     if (not $locale and ($ENV{HTTP_COOKIE}||'') =~ /\blocale=(\w+)/) {
@@ -811,7 +811,7 @@ unless ($file) {
   http_header('200 OK',@cookies);
   # print html_header($head,'<img src="/fex_small.gif">');
   print html_header($head);
-    
+
   if ($http_client =~ /(Konqueror|w3m)/) {
     pq(qq(
       '<p><hr><p>'
@@ -824,11 +824,11 @@ unless ($file) {
   }
 
   # default "fex yourself" setting?
-  if ($from and $id and $id eq $rid and not $addto 
+  if ($from and $id and $id eq $rid and not $addto
       and not ($gkey or $skey or $okey or $public or $anonymous)
       and (not @to or "@to" eq $from)
       and -f "$from/\@FEXYOURSELF")
-  { 
+  {
     @to = ($from);
     $nomail = 'fexyourself';
   }
@@ -838,9 +838,9 @@ unless ($file) {
          and not ($gkey or $skey or $okey or $public or $anonymous))
   {
     present_locales('/fup');
-    
+
     @ab = ("<option></option>");
-    
+
     # select menu from server address book
     if (open my $AB,'<',"$from/\@ADDRESS_BOOK") {
       while (<$AB>) {
@@ -853,7 +853,7 @@ unless ($file) {
       }
       close $AB;
     }
-    
+
     unless (@to) {
       unless ($nomail) {
         foreach (glob "$from/\@GROUP/*") {
@@ -864,7 +864,7 @@ unless ($file) {
         }
       }
     }
-      
+
     my $ab64 = b64("from=$from&id=$id");
 #     '<form class="uploadform" name="upload"'
     pq(qq(
@@ -925,14 +925,14 @@ unless ($file) {
         '<a href="/foc?akey=$akey">user config & operation control</a>'
       ));
     }
-    
+
     if ($from eq $admin ) {
       pq(qq(
         '<p>'
         '<a href="/fac">server config & admin control</a>'
       ));
     }
-    
+
     if (0 and -f "$docdir/FIX.jar") {
       print "<p>\n";
       if    ($public) { print "<a href=\"/fix?from=$from&id=$public&to=$to\">" }
@@ -945,10 +945,20 @@ unless ($file) {
     if (-x "$FEXHOME/cgi-bin/login") {
       print $info_login||$info_1;
     }
-    print "</body></html>\n";
+    pq(qq(
+      '<p><hr><p>'
+      '<b>'
+      'Warning: the recipient must not be a mailing list, because after'
+      'download the file will be no more available!'
+      '</b><br>'
+      'Contact <a href="mailto:$ENV{SERVER_ADMIN}">fexmaster</a>'
+      'if you want to fex to a mailing list,'
+      'he can allow multiple downloads for specific addresses.'
+      '</body></html>'
+    ));
     exit;
-  } 
-  
+  }
+
   # ask for filename
   if ($from and ($id or $okey)) {
     $to = $group if $group;
@@ -957,16 +967,14 @@ unless ($file) {
     pq(qq(
       '<script type="text/javascript">'
       '  function showstatus() {'
-      '    var file  = document.forms["upload"].elements["file"].value;'
-      '    if (file != "") {'
-      '      window.open('
-      "        '/$cgi?showstatus=$uid',"
-      "        'fup_status',"
-      "        'width=700,height=500'"
-      '      );'
-      '      return true;'
-      '    }'
-      '    return false;'
+      '    var file = document.forms["upload"].elements["file"].value;'
+      '    if (file == "") return false;'
+      '    window.open('
+      "      '/$cgi?showstatus=$uid',"
+      "      'fup_status',"
+      "      'width=700,height=500'"
+      '    );'
+      '    return true;'
       '  }'
       ''
       '  function checkupload() {'
@@ -996,7 +1004,7 @@ unless ($file) {
       '  <input type="hidden" name="from"     value="$from">'
       '  <input type="hidden" name="filesize" value="">'
     ));
-    
+
     if ($public) {
       my $toh = join('<br>',@to);
       pq(qq(
@@ -1058,14 +1066,14 @@ unless ($file) {
         ));
       }
     }
-    
+
     $autodelete = lc $autodelete;
     $keep = $keep_default unless $keep;
     my ($quota,$du) = check_sender_quota($muser||$from);
-    $quota = $quota 
-           ? "<tr><td>sender quota (used):<td>$quota ($du) MB</tr>" 
+    $quota = $quota
+           ? "<tr><td>sender quota (used):<td>$quota ($du) MB</tr>"
            : '';
-    
+
     $bwl = qq'<input type="text" name="bwlimit" size="8" value="$bwlimit"> kB/s';
     if (@throttle) {
       foreach (@throttle) {
@@ -1078,7 +1086,7 @@ unless ($file) {
               $bwl = qq'<input type="hidden" name="bwlimit" value="$limit"> $limit kB/s';
               last;
             }
-          } 
+          }
           # throttle e-mail address?
           else {
             # allow wildcard *, but not regexps
@@ -1092,14 +1100,14 @@ unless ($file) {
         }
       }
     }
-    
+
     $autodelete = $autodelete{$to} if $autodelete{$to};
-    
+
     my $adt = '';
     for ($autodelete) {
-         if (/yes/i)   { $adt = 'delete file after download' } 
+         if (/yes/i)   { $adt = 'delete file after download' }
       elsif (/no/i)    { $adt = 'do not delete file after download' }
-      elsif (/delay/i) { $adt = 'delete file after download with delay' } 
+      elsif (/delay/i) { $adt = 'delete file after download with delay' }
       elsif (/^\d+$/)  { $adt = "delete file $autodelete days after download" }
     }
     $adt .= qq'<input type="hidden" name="autodelete" value="$autodelete">';
@@ -1201,10 +1209,9 @@ unless ($file) {
     '  <p><input type="submit" value="check ID and continue"><p>'
   ));
   if (not $nomail and (
-    @local_domains and @local_hosts and ipin($ra,@local_hosts)
-    or @local_rdomains and @local_rhosts and
-       (not @registration_hosts or ipin($ra,@registration_hosts)) 
-    or @demo
+    @local_domains and @local_hosts or
+    @local_rdomains and @local_rhosts or
+    @demo
   )) {
     pq(qq(
       'You can <a href="/fur">register yourself</a> '
@@ -1224,7 +1231,7 @@ unless ($file) {
   #  ));
   # }
   print "</form>\n";
-    
+
   print $info_1;
 
   if ($debug and $debug>1) {
@@ -1234,7 +1241,7 @@ unless ($file) {
     }
     print "</pre>\n";
   }
-  
+
   print "</body></html>\n";
   exit;
 }
@@ -1244,6 +1251,7 @@ if ($from and $file and not @to) {
   check_rr($from,$from);
   @to = ($from);
   $sup = 'fexyourself';
+  $keep{$from} = readlink("$from/\@KEEP")||$keep_default;
 }
 
 # all these variables should be defined here, but just to be sure...
@@ -1304,7 +1312,7 @@ if (not $anonymous and $overwrite =~ /^n/i) {
 # additional last check
 unless (@group or $gkey or $skey or $public or $okey) {
   foreach $to (@to) {
-    checkaddress($to) or 
+    checkaddress($to) or
       http_die("<code>$to</code> is not a valid e-mail address");
   }
 }
@@ -1312,7 +1320,7 @@ unless (@group or $gkey or $skey or $public or $okey) {
 
 $to = join(',',@to);
 
-# file overwriting for anonymous is only possible if his client has the 
+# file overwriting for anonymous is only possible if his client has the
 # download cookie - else request purging
 if ($anonymous and not $seek and my $dkey = readlink "$to/$from/$fkey/dkey") {
   if ($overwrite =~ /^n/i) {
@@ -1359,12 +1367,12 @@ unless ($nostore) {
     $overwrite{$to}++ if -f $save and not -f $download;
     unlink $save,$download;
     rename $upload,$save or http_die("cannot rename $upload to $save - $!\n");
-    
+
     # log dkey
     my $msg = sprintf "%s %s %s %s %s\n",
                       isodate(time),$dkey{$to},$from,$to,$fkey;
     writelog('dkey.log',$msg);
-    
+
     # send notification e-mails if necessary
     if (not $nomail and (readlink "$to/\@NOTIFICATION"||'') !~ /^no/i
         and ($comment or not $overwrite{$to})) {
@@ -1424,7 +1432,7 @@ if ($nostore) {
   printf "%s (%s MB) received\n",$file,int($ndata/$MB);
 } elsif (not $restricted and ($anonymous or $from eq $to)) {
   my $size = $ndata<2*1024 ? sprintf "%s B",$ndata:
-             $ndata<2*$MB   ? sprintf "%s kB",int($ndata/1024):
+             $ndata<2*$MB  ? sprintf "%s kB",int($ndata/1024):
                              sprintf "%s MB",int($ndata/$MB);
   pq(qq(
     '<code>$file</code> ($size) received and saved<p>'
@@ -1474,9 +1482,9 @@ if ($nostore) {
           print "Link is valid for $keep{$to} days!<p>\n";
         }
       }
-    } elsif ($overwrite{$to} and not $comment) { 
-      print "(old <code>$file</code> for $to overwritten)<p>\n" 
-    } else { 
+    } elsif ($overwrite{$to} and not $comment) {
+      print "(old <code>$file</code> for $to overwritten)<p>\n"
+    } else {
       print "$to notified<p>\n"
     }
   }
@@ -1517,7 +1525,7 @@ sub parse_request {
       setparam($k,$v);
     }
   }
-  
+
   # decode base64 PATH_INFO to QUERY_STRING
   if ($ENV{PATH_INFO} =~ m:^/(\w+=*)$:) {
     if ($qs) {
@@ -1534,7 +1542,7 @@ sub parse_request {
         my $x = $1;
         # decode URL-encoding
         s/%([a-f0-9]{2})/chr(hex($1))/gie;
-        setparam($x,$_); 
+        setparam($x,$_);
       }
     }
   }
@@ -1552,15 +1560,15 @@ sub parse_request {
     );
     &reexec;
   }
-  
+
   if ($showstatus) {
     &showstatus;
     exit;
   }
-  
+
   # check for akey, gkey and skey (from HTTP GET)
   &check_keys;
-  
+
   if ($ENV{REQUEST_METHOD} eq 'POST' and $cl) {
     foreach $sig (keys %SIG) {
       if ($sig !~ /^(CHLD|CLD)$/) {
@@ -1575,11 +1583,11 @@ sub parse_request {
                      $cl,$ENV{REMOTE_ADDR}||'',$ENV{REMOTE_HOST}||''),"\n");
 
     &check_space($cl) if $cl > 0;
-    
+
     $SIG{ALRM} = sub { die "TIMEOUT\n" };
     alarm($timeout);
     binmode(STDIN,':raw');
-    
+
     if (defined($ENV{FEX_FILENAME})) {
       # JUP via HTTP header
       $file = $param{'FILE'} = $ENV{FEX_FILENAME};
@@ -1597,7 +1605,7 @@ sub parse_request {
       } else {
         http_die("malformed HTTP POST (no boundary found)");
       }
-    
+
       READPOST: while (&nvt_read) {
         # the file itself - *must* be last part of POST!
         if (/^Content-Disposition:\s*form-data;\s*name="file";\s*filename="(.+)"/i) {
@@ -1611,7 +1619,7 @@ sub parse_request {
             push @header,$_;
           }
           # STDIN is now at begin of file, will be read later with get_file()
-          last; 
+          last;
         }
         # all other parameters
         if (/^Content-Disposition:\s*form-data;\s*name="([a-z]\w*)"/i) {
@@ -1626,7 +1634,7 @@ sub parse_request {
         }
       }
     }
-    
+
     if (length($file)) {
       $file =~ s/%(\d+)/chr($1)/ge;
       $file = untaint(strip_path(normalize($file)));
@@ -1653,10 +1661,10 @@ sub parse_request {
   }
 
   # collect multiple addresses and check for aliases (not group)
-  if (@to and "@to" !~ /^@[\w-]+$/ 
-      and not ($gkey or $addto or $command =~ /^LIST(RECEIVED)?$/)) 
+  if (@to and "@to" !~ /^@[\w-]+$/
+      and not ($gkey or $addto or $command =~ /^LIST(RECEIVED)?$/))
   {
-        
+
     # read address book
     if ($from and open my $AB,'<',"$from/\@ADDRESS_BOOK") {
       my ($alias,$address,$autodelete,$locale,$keep);
@@ -1694,7 +1702,7 @@ sub parse_request {
           } elsif ($autodelete{$to}) {
             $autodelete{$address} = $autodelete{$to};
           } else {
-            $autodelete{$address} = readlink "$address/\@AUTODELETE" 
+            $autodelete{$address} = readlink "$address/\@AUTODELETE"
                                     || $autodelete;
           }
           if (my $locale = readlink "$address/\@LOCALE") {
@@ -1725,6 +1733,7 @@ sub parse_request {
         $keep{$to}       = $1 if $to =~ /:keep=(\d+)/i;
         $autodelete{$to} = $1 if $to =~ /:autodelete=(\w+)/i;
       }
+      $autodelete{$to} = 'NO' if $to =~ /$amdl/; # mailing lists, etc
       if (-e "$to/\@CAPTIVE") {
         my $v;
         $v = readlink "$to/\@AUTODELETE" and $autodelete{$to} = $v;
@@ -1732,13 +1741,13 @@ sub parse_request {
       }
     }
     @to = keys %to;
-    
+
     if (scalar(@to) == 1) {
-      $to = "@to";        
+      $to = "@to";
       $keep       = $keep{$to}       if $keep{$to};
       $autodelete = $autodelete{$to} if $autodelete{$to};
     }
-        
+
     # check recipients and eliminate dupes
     %to = ();
     foreach $to (@to) {
@@ -1777,7 +1786,7 @@ sub showstatus {
   my ($t0,$t1,$t2,$tt,$ts,$tm);
   my ($osize,$percent,$npercent);
   local $_;
-  
+
   $wclose = '<p><a href="#" onclick="window.close()">close</a>'."\n".
             '</body></html>'."\n";
   $ukey   = "$ukeydir/$uid";
@@ -1788,10 +1797,10 @@ sub showstatus {
     sleep 1;
     $tsize = readlink $sfile and last;
     # upload error?
-    # remark: stupid Internet Explorer *needs* the error represented in this 
+    # remark: stupid Internet Explorer *needs* the error represented in this
     # asynchronous popup window, because it cannot display the error in the
     # main window on HTTP POST!
-    if (-f $ukey and open $ukey,'<',$ukey or 
+    if (-f $ukey and open $ukey,'<',$ukey or
         -f "$ukey/error" and open $ukey,'<',"$ukey/error") {
       undef $/;
       unlink $ukey;
@@ -1799,7 +1808,7 @@ sub showstatus {
     }
   }
   # unlink $sfile;
-  
+
   if (defined $tsize and $tsize == 0) {
     print "<script type='text/javascript'>window.close()</script>\n";
     exit;
@@ -1809,7 +1818,7 @@ sub showstatus {
                "no file data received - does your file exist or is it >2GB?")
   }
   html_error($error,"file size unknown") unless $tsize =~ /^\d+$/;
-  
+
   http_header('200 OK');
   if (open $ukey,'<',"$ukey/filename") {
     local $/;
@@ -1817,14 +1826,14 @@ sub showstatus {
     close $ukey;
   }
   http_die("no filename?!") unless $file;
-  
+
   my $ssize = $tsize;
   if ($ssize<2097152) {
     $ssize = sprintf "%d kB",int($ssize/1024);
   } else {
     $ssize = sprintf "%d MB",int($ssize/1048576);
   }
-  
+
   pq(qq(
     "<html><body>"
     "<center>"
@@ -1836,7 +1845,7 @@ sub showstatus {
     "<div style='float:left;width:0%;background:black;height:20px;' id='bar'>"
     "</div></div>"
   ));
-    
+
   # wait for upload file
   for (1..9) {
     last if -f $upload or -f $data;
@@ -1847,13 +1856,13 @@ sub showstatus {
     print $wclose;
     exit;
   }
-  
+
   $SIG{ALRM} = sub { die "TIMEOUT in showstatus: no (more) data received\n" };
   alarm($timeout*2);
-  
+
   $t0 = $t1 = time;
   $osize = $percent = $npercent = 0;
-  
+
   for ($percent = 0; $percent<100; sleep(1)) {
     $t2 = time;
     $nsize = -s $upload;
@@ -1877,7 +1886,7 @@ sub showstatus {
     # so, updating more often is contra-productive
     if ($t2>$t1+5 or $npercent>$percent) {
       $percent = $npercent;
-      $t1 = $t2; 
+      $t1 = $t2;
       $tm = int(($t2-$t0)/60);
       $ts = $t2-$t0-$tm*60;
       $tt = sprintf("%d:%02d",$tm,$ts);
@@ -1889,7 +1898,7 @@ sub showstatus {
       )) or last;
     }
   }
-  
+
   alarm(0);
   if ($npercent == 100) {
     print "<h3>file successfully transferred</h3>\n";
@@ -1934,26 +1943,26 @@ sub get_file {
           http_die("<code>$filed</code> locked: a download is currently in progress");
       }
     }
-    
+
     # prepare upload
     foreach $to (@to) {
       $to =~ s/:\w+=.*//; # remove options from address
       $filed = "$to/$from/$fkey";
       $nupload = "$filed/upload"; # upload for next recipient
       mkdirp($filed);
-      
+
       # upload already prepared (for first recipient)?
       if ($upload) {
         # link upload for next recipient
         unless ($upload eq $nupload or
                 -r $upload and -r $nupload and
-                (stat $upload)[1] == (stat $nupload)[1]) 
+                (stat $upload)[1] == (stat $nupload)[1])
         {
           unlink $nupload;
           link $upload,$nupload;
         }
-      } 
-      
+      }
+
       # first recipient => create upload
       else {
         $upload = $nupload;
@@ -2005,7 +2014,7 @@ sub get_file {
           symlink "../$filed","$ukeydir/$uid";
         }
       }
-      
+
       unlink "$filed/autodelete",
              "$filed/error",
              "$filed/restrictions",
@@ -2021,7 +2030,7 @@ sub get_file {
              "$filed/comment",
              "$filed/notify";
       unlink "$filed/size" unless $seek;
-    
+
       # showstatus needs file name and size
       # fexsend needs full file size (+$seek)
       $fh = "$filed/filename";
@@ -2035,16 +2044,16 @@ sub get_file {
         unless ($seek) {
           if ($::filesize > 0) {
             # total file size as reported by POST
-            mksymlink("$filed/size",$::filesize) 
+            mksymlink("$filed/size",$::filesize)
               or die "cannot write $filed/size - $!\n";
           } else {
             # file size as counted
-            mksymlink("$filed/size",$filesize) 
+            mksymlink("$filed/size",$filesize)
               or die "cannot write $filed/size - $!\n";
           }
         }
       }
-    
+
       if ($from eq "@to") {
         # special "fex yourself"
         mksymlink("$filed/autodelete",'NO');
@@ -2077,24 +2086,24 @@ sub get_file {
       if ($replyto and $replyto =~ /.@./) {
         mksymlink("$filed/replyto",$replyto);
       }
-    
+
       my $arh = "$from/\@ALLOWED_RHOSTS";
       if (-s $arh) {
         copy($arh,"$filed/restrictions");
       }
-      
+
       if (@header and open $fh,'>',"$filed/header") {
         print {$fh} join("\n",@header),"\n";
         close $fh;
       }
-    
+
       if ((readlink "$to/\@NOTIFICATION"||'') =~ /^no/i) {
         $nomail{$to} = 'NOTIFICATION';
       }
 
       if ($nomail) {
         open $fh,'>',"$filed/notify" and close $fh;
-      } 
+      }
       if ($comment) {
         if (open $fh,'>',"$filed/comment") {
           print {$fh} encode_utf8($comment);
@@ -2106,17 +2115,17 @@ sub get_file {
       unless ($dkey = readlink("$filed/dkey") and -l "$dkeydir/$dkey") {
         $dkey = randstring(8);
         unlink "$dkeydir/$dkey";
-        symlink "../$filed","$dkeydir/$dkey" 
+        symlink "../$filed","$dkeydir/$dkey"
           or http_die("cannot symlink $dkeydir/$dkey ($!)");
         unlink "$filed/dkey";
         symlink $dkey,"$filed/dkey";
       }
-    
+
     }
 
     # extra download (XKEY)?
     if ($anonymous and $fkey =~ /^afex_\d/ or
-        $from eq "@to" and $comment =~ s:^//(.*)$:NOMAIL:) 
+        $from eq "@to" and $comment =~ s:^//(.*)$:NOMAIL:)
     {
       $xkey = $1||$fkey;
       $nomail = $comment;
@@ -2125,15 +2134,15 @@ sub get_file {
         if (-e $x) {
           http_die("extra download key $xkey already exists");
         }
-        symlink "../$from/$from/$fkey",$x 
+        symlink "../$from/$from/$fkey",$x
           or http_die("cannot symlink $x - $!\n");
         unlink "$x/xkey";
         symlink $xkey,"$x/xkey";
       }
     }
-    
+
   }
-  
+
   # file link?
   if ($flink) {
     # upload link has been already created, no data to read any more
@@ -2147,7 +2156,7 @@ sub get_file {
 
     # at last, read (real) file data
     $t0 = time();
-  
+
     # streaming data?
     if ($cl == -1) {
       alarm($timeout*2);
@@ -2161,11 +2170,11 @@ sub get_file {
       }
       # size of transferred file, without end boundary
       $ndata = untaint($fb-$ebl);
-    } 
-    
+    }
+
     # normal file with known file size
     else {
-      
+
       if ($fpsize) {
         debuglog(sprintf("still awaiting %d+%d = %d bytes",
                  $fpsize,$ebl,$fpsize+$ebl));
@@ -2179,7 +2188,7 @@ sub get_file {
       }
       # read until end boundary, not EOF
       while ($RB < $cl-$ebl) {
-        $b = $cl-$ebl-$RB; 
+        $b = $cl-$ebl-$RB;
         $b = $bs if $b > $bs;
         # max wait for 1 kB/s, but at least 10 s
         # $timeout = $b/1024;
@@ -2213,17 +2222,17 @@ sub get_file {
       }
       $RB += $ebl;
       $ndata = untaint($fb);
-    } 
+    }
 
     alarm(0);
-  
+
     unless ($nostore) {
       close $upload; # or die "cannot close $upload - $!\n";;
-  
+
       # throuput in kB/s
       $tt = (time-$t0) || 1;
       mksymlink("$filed/speed",int($fb/1024/$tt));
-      
+
       unless ($ndata) {
         http_die(
           "No file data received!".
@@ -2231,12 +2240,12 @@ sub get_file {
           " File too big (browser-limit: 2 GB!)?"
         );
       }
-      
+
       $to = join(',',@to);
-    
+
       # streaming upload?
       if ($cl == -1) {
-      
+
         open $upload,'<',$upload or http_die("internal error - cannot read upload");
         seek $upload,$ndata+2,0;
         $_ = <$upload>||'';
@@ -2245,12 +2254,12 @@ sub get_file {
         }
         close $upload;
         truncate $upload,$ndata;
-        
+
       } else {
-      
+
         # truncate boundary string
         # truncate $upload,$ndata+$uss if -s $upload > $ndata+$uss;
-      
+
         # incomplete?
         if ($cl != $RB) {
           fuplog($to,$fkey,$ndata,'(aborted)');
@@ -2260,19 +2269,19 @@ sub get_file {
             http_die("read $RB bytes, but CONTENT_LENGTH announces $cl bytes");
           }
         }
-      
+
         # multipost, not complete
         if ($::filesize > -s $upload) {
           http_header('206 Partial OK');
           exit;
         }
-      
+
         # save error?
         if (-s $upload > ($::filesize||$filesize)) {
           fuplog($to,$fkey,$ndata,'(write error: upload > filesize)');
           http_die("internal server error while writing file data");
         }
-      
+
       }
       fuplog($to,$fkey,$ndata);
       debuglog("upload successfull, dkey=$dkey");
@@ -2287,7 +2296,7 @@ sub check_rr {
   my @to = @_;
   my $rr = "$from/\@ALLOWED_RECIPIENTS";
   my ($allowed,$to,$ar,$rd);
-  
+
   if (-s $rr and open $rr,'<',$rr) {
 
     $restricted = $rr;
@@ -2300,7 +2309,7 @@ sub check_rr {
         chomp;
         s/#.*//;
         s/\s//g;
-        
+
         if (/^\@LOCAL_RDOMAINS/) {
           $ar = '(@';
           foreach (@local_rdomains) {
@@ -2316,21 +2325,21 @@ sub check_rr {
           $ar = quotemeta $_;
           $ar =~ s/\\\*/[^@]*/g;
         }
-        
+
         if ($to =~ /^$ar$/i) {
           $allowed = 1;
           last;
         }
-        
+
       }
-      
+
       unless ($allowed) {
         fuplog("ERROR: $from not allowed to fex to $to");
         debuglog("$to not in $spooldir/$from/\@ALLOWED_RECIPIENTS");
         http_die("You ($from) are not allowed to fex to $to");
       }
     }
-    
+
     close $rr;
   }
 }
@@ -2340,24 +2349,24 @@ sub check_rr {
 sub expand {
   my @users = @_;
   my @ua;
-  
+
   foreach my $u (my @loop = @users) {
-    if ($u =~ /^anonymous(_\d+)?$/) { 
+    if ($u =~ /^anonymous(_\d+)?$/) {
       $u = "$u\@$hostname";
     }
-    if ($u eq 'nettest') { 
+    if ($u eq 'nettest') {
       if ($mdomain and -d "$u\@$mdomain") {
         $u .= "\@$mdomain"
       } elsif (-d "$u\@$hostname") {
-        $u .= "\@$hostname"    
+        $u .= "\@$hostname"
       }
     }
-    if    ($u =~ /@/)          { push @ua,$u } 
-    elsif ($mdomain)           { push @ua,"$u\@$mdomain" } 
-    elsif (-d "$u\@$hostname") { push @ua,"$u\@$hostname" } 
+    if    ($u =~ /@/)          { push @ua,$u }
+    elsif ($mdomain)           { push @ua,"$u\@$mdomain" }
+    elsif (-d "$u\@$hostname") { push @ua,"$u\@$hostname" }
     else                       { push @ua,$u }
   }
-  
+
   return wantarray ? @ua : join(',',@ua);
 }
 
@@ -2408,7 +2417,7 @@ sub forward {
     print html_header($head);
 
     @to = keys %to;
-    
+
     foreach my $to (my @loop = @to) {
       $to =~ s/:\w+=.*//; # remove options from address
       $nfile = $file;
@@ -2448,13 +2457,13 @@ sub forward {
       unless ($dkey = readlink("$nfile/dkey") and -l "$dkeydir/$dkey") {
         $dkey = randstring(8);
         unlink "$dkeydir/$dkey";
-        symlink "../$nfile","$dkeydir/$dkey" 
+        symlink "../$nfile","$dkeydir/$dkey"
           or http_die("cannot symlink $dkeydir/$dkey");
         unlink "$nfile/dkey";
-        symlink $dkey,"$nfile/dkey" 
+        symlink $dkey,"$nfile/dkey"
           or http_die("cannot create $nfile/dkey - $!");
       }
-      
+
       if ($nomail or $nomail{$to}) {
         if ($filename) {
           my $url = "$durl/$dkey/".normalize_filename($filename);
@@ -2549,7 +2558,7 @@ sub calcsize {
 sub setparam {
   my ($v,$vv) = @_;
   my ($idf,$to);
-  
+
   $v = uc(despace($v));
 
 #  if ($vv =~ /([<>])/) {
@@ -2571,32 +2580,39 @@ sub setparam {
         'Content-Length: 0',
         ""
       );
-      &reexec;
+    } else {
+      nvt_print(
+        "HTTP/1.1 302 Found",
+        "Location: $ENV{PROTO}://$ENV{HTTP_HOST}/fup",
+        'Content-Length: 0',
+        ""
+      );
     }
+    &reexec;
   } elsif ($v eq 'LOCALE' and $vv =~ /^(\w+)$/) {
     $locale = $1;
   } elsif ($v eq 'REDIRECT' and $vv =~ /^([\w?=]+)$/) {
     $redirect = $1;
-  } elsif (($v eq 'KEY' or $v eq 'SKEY') and $vv =~ /^([\w:]+)$/) { 
+  } elsif (($v eq 'KEY' or $v eq 'SKEY') and $vv =~ /^([\w:]+)$/) {
     $skey = $1;
     $restricted = $v;
-  } elsif ($v eq 'GKEY' and $vv =~ /^([\w:]+)$/) { 
+  } elsif ($v eq 'GKEY' and $vv =~ /^([\w:]+)$/) {
     $gkey = $1 unless $nomail;
     $restricted = $v;
-  } elsif ($v eq 'DKEY' and $vv =~ /^(\w+)$/) { 
+  } elsif ($v eq 'DKEY' and $vv =~ /^(\w+)$/) {
     $dkey = $1;
-  } elsif ($v eq 'AKEY' and $vv =~ /^(\w+)$/) { 
+  } elsif ($v eq 'AKEY' and $vv =~ /^(\w+)$/) {
     $akey = $1;
-  } elsif ($v eq 'FROM' or $v eq 'USER') { 
+  } elsif ($v eq 'FROM' or $v eq 'USER') {
     $from = normalize_email($vv);
     $from = untaint(expand($from));
     checkchars('from address',$from);
     # maybe FROM=SUBUSER !
     # checkaddress($from) or http_die("FROM $from is no legal e-mail address");
-  } elsif ($v eq 'REPLYTO') { 
+  } elsif ($v eq 'REPLYTO') {
     $replyto = normalize_email($vv);
     checkchars('replyto address',$replyto);
-    checkaddress($replyto) or 
+    checkaddress($replyto) or
       http_die("REPLYTO $replyto is no legal e-mail address");
   } elsif ($v eq 'ADDTO') {
     $vv =~ s/\s.*//;
@@ -2668,7 +2684,7 @@ sub setparam {
   } elsif ($v eq 'SEEK' and $vv =~ /^(\d+)$/) {
     $seek = $1;
   } elsif ($v eq 'FILESIZE' and $vv =~ /^(\d+)$/) {
-    $filesize = $1; # complete filesize! 
+    $filesize = $1; # complete filesize!
     &check_space($filesize-$seek);
   } elsif ($v eq 'AUTODELETE' and $vv =~ /^(\w+)$/) {
     $specific{'autodelete'} = $autodelete = uc($1);
@@ -2677,19 +2693,19 @@ sub setparam {
     $keep = $keep_max if $keep_max and $keep > $keep_max;
     $specific{'keep'} = $keep;
   } elsif ($v eq 'TIMEOUT' and $vv =~ /^(\d+)$/) {
-    $specific{'timeout'} = $timeout = $1;     
+    $specific{'timeout'} = $timeout = $1;
   }
 }
 
 
 sub id_forgotten {
   my ($id,$to,$subuser,$gm,$skey,$gkey,$url,$fup);
-  
+
   return if $nomail;
-  
+
   $fup = $durl;
   $fup =~ s:/fop:/fup:;
-  
+
   # full user
   if (open $from,'<',"$from/\@") {
     $id = getline($from);
@@ -2706,7 +2722,7 @@ sub id_forgotten {
     )));
     exit;
   }
-  
+
   # sub user
   foreach my $skey (glob("$skeydir/*")) {
     if (-f $skey and open $skey,'<',$skey) {
@@ -2729,7 +2745,7 @@ sub id_forgotten {
       exit;
     }
   }
-  
+
   # group user
   foreach my $gkey (glob("$gkeydir/*")) {
     if (-f $gkey and open $gkey,'<',$gkey) {
@@ -2851,7 +2867,7 @@ sub check_keys {
     # sid is not set with web browser
     # akey with sid is set with schwuppdiwupp & co
     $idf = "$akeydir/$akey/@";
-    
+
     if (open $idf,'<',$idf and $id = getline($idf)) {
       close $idf;
       $from = readlink "$akeydir/$akey"
@@ -2874,7 +2890,7 @@ sub check_space {
   my $req = shift;
   my ($df,$free,$uprq);
   local *P;
-  
+
   if (open $df,"df -k $spooldir|") {
     while (<$df>) {
       if (/^.+?\s+\d+\s+\d+\s+(\d+)/ and $req/1024 > $1) {
@@ -2903,10 +2919,10 @@ sub check_space {
 
 
 # global substitution as a function like in gawk
-sub gsub { 
+sub gsub {
   local $_ = shift;
-  my ($p,$r) = @_; 
-  s/$p/$r/g; 
+  my ($p,$r) = @_;
+  s/$p/$r/g;
   return $_;
 }
 
@@ -2914,7 +2930,7 @@ sub gsub {
 # standard log
 sub fuplog {
   my $msg = "@_";
-  
+
   $msg =~ s/\n/ /g;
   $msg =~ s/\s+$//;
   $msg = sprintf "%s [%s_%s] %s (%s) %s\n",
@@ -2949,9 +2965,9 @@ sub sigexit {
                  encode_Q($file||'-'),
                  $msg,
                  $RB?"(after $RB bytes)":"";
-  
+
   writelog($log,$msg);
-  
+
   if ($sig eq 'DIE') {
     shift;
     die "$msg\n";
@@ -2965,14 +2981,14 @@ sub present_locales {
   my $url = shift;
   my @locales = @::locales; # from fex.ph
   my ($locale,$lang);
-  
-  if ($url =~ /\?/) { 
+
+  if ($url =~ /\?/) {
     $url .= "&";
     $url =~ s/locale=\w+&//g;
-  } else { 
+  } else {
     $url .= "?";
   }
-  
+
   if (@locales) {
     map { $_ = "$FEXHOME/locale/$_" } @locales;
   } else {
@@ -3001,7 +3017,7 @@ sub present_locales {
 sub check_camel {
   my ($logo,$camel);
   local $/;
-  
+
   if (open $logo,"$docdir/logo.jpg") {
     $camel = md5_hex(<$logo>) eq 'ad8a95bba8dd1a61d70bd38611bc2059';
   }