Original release 20160328

[fex.git] / cgi-bin / fuc

diff --git a/cgi-bin/fuc b/cgi-bin/fuc
index 661c897367a7418beabb0ec97bf7b57a693a3a3f..897fd69a719aea0972630ac725462595a5808a6b 100755 (executable)
--- a/cgi-bin/fuc
+++ b/cgi-bin/fuc
@@ -8,6 +8,7 @@
 
 BEGIN { ($ENV{PERLINIT}||'') =~ /(.+)/s and eval $1 }
 
 
 BEGIN { ($ENV{PERLINIT}||'') =~ /(.+)/s and eval $1 }
 

+use utf8;

 use Fcntl      qw(:flock);
 use Digest::MD5        qw(md5_hex);
 
 use Fcntl      qw(:flock);
 use Digest::MD5        qw(md5_hex);
 


@@ -74,7 +75,7 @@ foreach my $v (keys %PARAM) {
     $v =~ /^group$/i           ? $group        = checkchars('group',$vv):
     $v =~ /^ab$/i              ? $ab           = $vv:
     $v =~ /^gm$/i              ? $gm           = $vv:
     $v =~ /^group$/i           ? $group        = checkchars('group',$vv):
     $v =~ /^ab$/i              ? $ab           = $vv:
     $v =~ /^gm$/i              ? $gm           = $vv:

-    $v =~ /^show$/i            ? $tools        = checkchars('parameter',$vv):
+    $v =~ /^show$/i            ? $show         = checkchars('parameter',$vv):

   $ESAC;
 }
 
   $ESAC;
 }
 


@@ -87,6 +88,30 @@ $user .= '@'.$mdomain if $mdomain and $user !~ /@/;
 
 $nomail = $comment if $comment =~ /NOMAIL|!#!/;
 
 
 $nomail = $comment if $comment =~ /NOMAIL|!#!/;
 

+if ($show and $show eq 'tools') {
+  nvt_print(
+    "HTTP/1.1 302 Found",
+    "Location: /tools.html",
+    'Expires: 0',
+    'Content-Length: 0',
+    ''
+  );
+  &reexec;
+
+  if (open $tools,"$docdir/tools.html") {
+    while (<$tools>) {
+      while (/\$([\w_]+)\$/) {
+        my $var = $1;
+        my $env = $ENV{$var} || '';
+        s/\$$var\$/$env/g;
+      };
+      print;
+    }
+  }
+  exit;
+}
+
+

 if ($akey) {
 
   # sid is not set with web browser
 if ($akey) {
 
   # sid is not set with web browser


@@ -110,7 +135,7 @@ if ($akey) {
 if ($user and $akey and $qs and $qs =~ /info=(.+?)&skey=(.+)/) {
   $subuser = $1;
   $skey = $2;
 if ($user and $akey and $qs and $qs =~ /info=(.+?)&skey=(.+)/) {
   $subuser = $1;
   $skey = $2;

-  notify_subuser($user,$subuser,"$fup?skey=$skey",$comment);
+  notify_subuser($user,$subuser,"$fup?skey=$skey#$user",$comment);

   http_header("200 OK");
   print html_header($head);
   pq(qq(
   http_header("200 OK");
   print html_header($head);
   pq(qq(


@@ -154,7 +179,7 @@ if ($user and $id) {
 
 # empty POST? ==> back to foc
 if ($ENV{REQUEST_METHOD} eq 'POST' and not
 
 # empty POST? ==> back to foc
 if ($ENV{REQUEST_METHOD} eq 'POST' and not

-    ($subuser or $notify or $nid or $ssid or $group or $ab or $gm or $tools
+    ($subuser or $notify or $nid or $ssid or $group or $ab or $gm

      or $disclaimer or $encryption or $pubkey))
 {
   nvt_print(
      or $disclaimer or $encryption or $pubkey))
 {
   nvt_print(


@@ -181,31 +206,6 @@ if ($gm and not $group) {
   exit;
 }
 
   exit;
 }
 

-if ($tools) {
-  pq(qq(
-    'To use one of the following F*EX clients you must configure them after'
-    'download:'
-    '<p>'
-    '<table border=1>'
-    '  <tr><th align=left>F*EX server:<td><code>$ENV{PROTO}://$ENV{HTTP_HOST}</code></tr>'
-    '  <tr><th align=left>Proxy:<td>(your web proxy address, may be empty)</tr>'
-    '  <tr><th align=left>User:<td><code>$user</code></tr>'
-    '  <tr><th align=left>Auth-ID:<td><code>$id</code></tr>'
-    '</table>'
-  ));
-  if (open $tools,"$docdir/tools.html") {
-    while (<$tools>) {
-      while (/\$([\w_]+)\$/) {
-        my $var = $1;
-        my $env = $ENV{$var} || '';
-        s/\$$var\$/$env/g;
-      };
-      print;
-    }
-  }
-  exit;
-}
-

 if ($group) {
   &handle_group;
 }
 if ($group) {
   &handle_group;
 }


@@ -845,6 +845,8 @@ sub notify_otuser {
     'To: $otuser'
     'Subject: Your upload URL'
     'X-Mailer: F*EX'
     'To: $otuser'
     'Subject: Your upload URL'
     'X-Mailer: F*EX'

+    'Content-Type: text/plain; charset=utf-8'
+    'Content-Transfer-Encoding: 8bit'

     ''
     'This is an automatically generated e-mail.'
     ''
     ''
     'This is an automatically generated e-mail.'
     ''


@@ -880,6 +882,8 @@ sub notify_subuser {
     'Cc: $user'
     'Subject: Your F*EX account on $server'
     'X-Mailer: F*EX'
     'Cc: $user'
     'Subject: Your F*EX account on $server'
     'X-Mailer: F*EX'

+    'Content-Type: text/plain; charset=utf-8'
+    'Content-Transfer-Encoding: 8bit'

     ''
     'This is an automatically generated e-mail.'
     ''
     ''
     'This is an automatically generated e-mail.'
     ''


@@ -924,7 +928,7 @@ sub notify_groupmember {
     ''
     'to upload files to F*EX group "$group"'
     ''
     ''
     'to upload files to F*EX group "$group"'
     ''

-    'See http://$ENV{HTTP_HOST}/ for more information about F*EX.'
+    'See http://$ENV{HTTP_HOST}/index.html for more information about F*EX.'

     ''
     'Questions? ==> F*EX admin: $admin'
   ));
     ''
     'Questions? ==> F*EX admin: $admin'
   ));