X-Git-Url: https://git.treefish.org/fex.git/blobdiff_plain/97b87610331f53e756d032ad21db786037f921a1..HEAD:/cgi-bin/fur

diff --git a/cgi-bin/fur b/cgi-bin/fur
index 2a75445..0ab7be9 100755
--- a/cgi-bin/fur
+++ b/cgi-bin/fur
@@ -7,6 +7,7 @@
 
 BEGIN { ($ENV{PERLINIT}||'') =~ /(.+)/s and eval $1 }
 
+use utf8;
 use Fcntl 	qw(:flock :seek :mode);
 
 # import from fex.ph
@@ -39,16 +40,18 @@ my $user = my $id = my $verify = '';
 
 &check_maint;
 
-unless (@local_domains and @local_rdomains) {
+unless (@local_domains or @local_rdomains) {
   html_error($error,
     "No domains for registrations are defined.",
     "Contact $ENV{SERVER_ADMIN} for details."
   );
 }
 
-unless (@local_hosts and ipin($ENV{REMOTE_ADDR}||0,@local_hosts)) {
+unless (@local_hosts and ipin($ra,@local_hosts) or
+        @local_rdomains and @local_rhosts and
+        (not @registration_hosts or ipin($ra,@registration_hosts))) {
   html_error($error,
-    "Registrations from your host ($ENV{REMOTE_ADDR}) are not allowed.",
+    "Registrations from your host ($ra) are not allowed.",
     "Contact $ENV{SERVER_ADMIN} for details."
   );
 }
@@ -88,9 +91,9 @@ if ($confirm) {
   }
   # if (-f "$user/@") { http_die("$user is already activated") }
   open $user,'>',"$user/@" or http_die("open $user/@ - $!\n");
-  print {$user} $id,"\n";  
+  print {$user} $id,"\n";
   close $user or http_die("close $user/@ - $!\n");
-  
+
   http_header("200 OK");
   print html_header($head);
   my $url = "$ENV{PROTO}://$ENV{HTTP_HOST}/fup/" . b64("from=$user&id=$id");
@@ -103,11 +106,11 @@ if ($confirm) {
     '<p>'
     'or you can use:'
     '<p>'
-    '<table>
+    '<table>'
     '  <tr><td>URL:<td><code><b>$ENV{PROTO}://$ENV{HTTP_HOST}/fup/</code></b></tr>'
     '  <tr><td>Sender:<td><code><b>$user</code></b></tr>'
     '  <tr><td>auth-ID:<td><code><b>$id</code></b></tr>'
-    '</table>
+    '</table>'
     '</body></html>'
   ));
   furlog("confirm: account $user created");
@@ -124,7 +127,7 @@ unless ($user or $exuser or $demouser) {
     '      accept-charset="UTF-8"'
     '      enctype="multipart/form-data">'
   ));
-  
+
   if (@local_domains and @local_hosts and ipin($ra,@local_hosts)) {
     $reg = $ra;
     if (grep(/\*/,@local_domains)) {
@@ -150,8 +153,8 @@ unless ($user or $exuser or $demouser) {
       ));
     }
   }
-  
-  if (@local_rdomains and @local_rhosts and 
+
+  if (@local_rdomains and @local_rhosts and
       (not @registration_hosts or ipin($ra,@registration_hosts))) {
     print "   <p>or<p>\n" if $reg;
     $reg = $ra;
@@ -161,7 +164,7 @@ unless ($user or $exuser or $demouser) {
       '  <p>'
     ));
   }
-  
+
   if (@demo) {
     print "   <p>or<p>\n" if $reg;
     $reg = $ra;
@@ -173,7 +176,7 @@ unless ($user or $exuser or $demouser) {
       '  <p>'
     ));
   }
-  
+
   if ($reg) {
     pq(qq(
       '  <p>'
@@ -194,7 +197,7 @@ unless ($user or $exuser or $demouser) {
     pq(qq(
       '</pre>'
       '<p><hr><p>'
-      '<a href="http://fex.rus.uni-stuttgart.de/users.html">User types overview</a>'
+      '<a href="/users.html">User types overview</a>'
       '</body></html>'
     ));
   } else {
@@ -244,7 +247,7 @@ if ($exuser) {
   $mydomains .= "|$mdomain" if $mdomain;
   $user .= '@'.$domain if $domain and $user !~ /@/;
   # $user .= '@'.$mdomain if $mdomain and $user !~ /@/;
-  
+
   unless (@local_hosts and ipin($ra,@local_hosts)) {
     html_error($error,
       "Registrations from your host ($ra) are not allowed.",
@@ -274,7 +277,7 @@ if (-f "$user/@") {
     $error,
     "you are already registered".
     " (<a href=\"/fup?from=$user&ID_forgotten=1\">I have lost my auth-ID</a>)"
-  ); 
+  );
 }
 
 unless (-d $user) {
@@ -295,7 +298,7 @@ if ($exuser) {
   print {$rf} "\@LOCAL_RHOSTS\n";
   close $rf;
   if (open $user,'>',"$user/.auto") {
-    print {$user} "fur:external\n";  
+    print {$user} "fur:external\n";
     close $user;
   }
 } elsif ($demouser) {
@@ -305,13 +308,13 @@ if ($exuser) {
   printf {$quota} "sender:%d\n",$demo[0];
   close $quota;
   if (open $user,'>',"$user/.auto") {
-    print {$user} "fur:demo\n";  
+    print {$user} "fur:demo\n";
     close $user;
   }
   open $demouser,'>',"$demouser/.demo" and close $demouser;
 } else {
   if (open $user,'>',"$user/.auto") {
-    print {$user} "fur:internal\n";  
+    print {$user} "fur:internal\n";
     close $user;
   }
 }
@@ -320,7 +323,7 @@ $id = randstring(6);
 
 if ("@local_domains" eq "*") {
   open $id,'>',"$user/@" or http_die("open $user/@ - $!\n");
-  print {$id} $id,"\n";  
+  print {$id} $id,"\n";
   close $id or http_die("close $user/@ - $!\n");
   http_header("200 OK");
   print html_header($head);
@@ -340,7 +343,7 @@ if ("@local_domains" eq "*") {
 # from fexsend
 if ($verify eq 'no') {
   open $id,'>',"$user/@" or http_die("open $user/@ - $!\n");
-  print {$id} $id,"\n";  
+  print {$id} $id,"\n";
   close $id or http_die("close $user/@ - $!\n");
   http_header("200 OK",'Content-Type: text/plain');
   print "$ENV{PROTO}://$ENV{HTTP_HOST}/fup?from=$user&ID=$id\n";
@@ -390,7 +393,7 @@ close $mail or http_die("cannot send mail - $!\n");
 http_header("200 OK");
 print html_header($head);
 print "confirmation e-mail has been sent to <code>$user</code>\n";
-print "</body></html>\n"; 
+print "</body></html>\n";
 furlog("confirmation request mailed to $user");
 exit;
 
@@ -398,12 +401,12 @@ exit;
 # standard log
 sub furlog {
   my $msg = "@_";
-  
+
   $msg =~ s/\n/ /g;
   $msg =~ s/\s+$//;
   $msg = sprintf "%s [%s_%s] %s %s\n",
                  isodate(time),$$,$ENV{REQUESTCOUNT},$fra,$msg;
-  
+
   writelog($log,$msg);
 }