--- loncom/auth/lonlogin.pm	2017/02/25 19:56:09	1.170
+++ loncom/auth/lonlogin.pm	2018/11/24 16:19:04	1.174
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.170 2017/02/25 19:56:09 raeburn Exp $
+# $Id: lonlogin.pm,v 1.174 2018/11/24 16:19:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,11 @@ 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'})) {
@@ -58,15 +63,16 @@ sub handler {
     }
 
 # For "public user" - remove any exising "public" cookie, as user really wants to log-in
-    my ($handle,$lonidsdir,$expire);
+    my ($handle,$lonidsdir,$expirepub,$userdom);
     unless ($r->header_only) {
-        $handle = &Apache::lonnet::check_for_valid_session($r);
+        $handle = &Apache::lonnet::check_for_valid_session($r,'lonID',undef,\$userdom);
         if ($handle ne '') {
             $lonidsdir=$r->dir_config('lonIDsDir');
             if ($handle=~/^publicuser\_/) {
                 unlink($r->dir_config('lonIDsDir')."/$handle.id");
                 undef($handle);
-                $expire = 1;
+                undef($userdom);
+                $expirepub = 1;
             }
         }
     }
@@ -74,11 +80,20 @@ sub handler {
     &Apache::loncommon::no_cache($r);
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::content_type($r,'text/html');
-    if ($expire) {
+    if ($expirepub) {
         my $c = new CGI::Cookie(-name    => 'lonPubID',
                                 -value   => '',
                                 -expires => '-10y',);
         $r->header_out('Set-cookie' => $c);
+    } elsif (($handle eq '') && ($userdom ne '')) {
+        my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+        foreach my $name (keys(%cookies)) {
+            next unless ($name =~ /^lon(|S|Link|Pub)ID$/);
+            my $c = new CGI::Cookie(-name    => $name,
+                                    -value   => '',
+                                    -expires => '-10y',);
+            $r->headers_out->add('Set-cookie' => $c);
+        }
     }
     $r->send_http_header;
     return OK if $r->header_only;
@@ -93,6 +108,45 @@ sub handler {
 
     $env{'form.firsturl'} =~ s/(`)/'/g;
 
+# Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
+
+    my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);
+    if ($found_server) {
+        my $hostname = &Apache::lonnet::hostname($found_server);
+        if ($hostname ne '') {
+            my $protocol = $Apache::lonnet::protocol{$found_server};
+            $protocol = 'http' if ($protocol ne 'https');
+            my $dest = '/adm/roles';
+            if ($env{'form.firsturl'} ne '') {
+                $dest = $env{'form.firsturl'};
+            }
+            my $url = $protocol.'://'.$hostname.$dest;
+            my $start_page =
+                &Apache::loncommon::start_page('Switching Server ...',undef,
+                                               {'redirect'       => [0,$url],});
+            my $end_page   = &Apache::loncommon::end_page();
+            $r->print($start_page.$end_page);
+            return OK;
+        }
+    }
+
+#
+# If browser sent an old cookie for which the session file had been removed
+# check if configuration for user's domain has a portal URL set.  If so
+# switch user's log-in to the portal.
+#
+
+    if (($handle eq '') && ($userdom ne '')) {
+        my %domdefaults = &Apache::lonnet::get_domain_defaults($userdom);
+        if ($domdefaults{'portal_def'} =~ /^https?\:/) {
+            my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
+                                          {'redirect' => [0,$domdefaults{'portal_def'}],});
+            my $end_page   = &Apache::loncommon::end_page();
+            $r->print($start_page.$end_page);
+            return OK;
+        }
+    }
+
 # -------------------------------- Prevent users from attempting to login twice
     if ($handle ne '') {
         &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);