Original release 20150729

[fex.git] / cgi-bin / fup

diff --git a/cgi-bin/fup b/cgi-bin/fup
index b1e01e631acbe9d0b653e557827a4e4a1c2f7a63..87cedafafc7fee9bb00810a6821ed16708f09471 100755 (executable)
--- 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 ($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)
 our ($dkeydir,$ukeydir,$akeydir,$skeydir,$gkeydir,$xkeydir);
 our ($MB,$DS);
 our $RB;               # read POST bytes (total)


@@ -945,7 +945,17 @@ unless ($file) {
     if (-x "$FEXHOME/cgi-bin/login") {
       print $info_login||$info_1;
     }
     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;
   } 
   
     exit;
   } 
   


@@ -1201,10 +1211,9 @@ unless ($file) {
     '  <p><input type="submit" value="check ID and continue"><p>'
   ));
   if (not $nomail and (
     '  <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> '
   )) {
     pq(qq(
       'You can <a href="/fur">register yourself</a> '


@@ -1725,6 +1734,7 @@ sub parse_request {
         $keep{$to}       = $1 if $to =~ /:keep=(\d+)/i;
         $autodelete{$to} = $1 if $to =~ /:autodelete=(\w+)/i;
       }
         $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;
       if (-e "$to/\@CAPTIVE") {
         my $v;
         $v = readlink "$to/\@AUTODELETE" and $autodelete{$to} = $v;


@@ -2571,8 +2581,15 @@ sub setparam {
         'Content-Length: 0',
         ""
       );
         '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?=]+)$/) {
   } elsif ($v eq 'LOCALE' and $vv =~ /^(\w+)$/) {
     $locale = $1;
   } elsif ($v eq 'REDIRECT' and $vv =~ /^([\w?=]+)$/) {