--- loncom/auth/lonlogin.pm	2020/10/26 02:06:16	1.158.2.9.2.2
+++ loncom/auth/lonlogin.pm	2021/01/04 03:49:10	1.158.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.9.2.2 2020/10/26 02:06:16 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.12 2021/01/04 03:49:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,11 +51,6 @@ sub handler {
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
-    if (!defined($env{'form.firsturl'})) {
-        if ($ENV{'REDIRECT_URL'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) {
-            $env{'form.firsturl'} = $ENV{'REDIRECT_URL'};
-        }
-    }
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -508,7 +503,7 @@ ENDSCRIPT
         my $omitextra;
         if ($headextra_exempt ne '') {
             my @exempt = split(',',$headextra_exempt);
-            my $ip = $ENV{'REMOTE_ADDR'};
+            my $ip = &Apache::lonnet::get_requestor_ip();
             if (grep(/^\Q$ip\E$/,@exempt)) {
                 $omitextra = 1;
             }
@@ -751,7 +746,7 @@ sub check_loginvia {
     my $output;
     if ($loginvia ne '') {
         my $noredirect;
-        my $ip = $ENV{'REMOTE_ADDR'};
+        my $ip = &Apache::lonnet::get_requestor_ip();
         if ($ip eq '127.0.0.1') {
             $noredirect = 1;
         } else {