--- loncom/auth/lonlogin.pm	2019/08/01 14:21:37	1.158.2.8
+++ loncom/auth/lonlogin.pm	2020/10/26 02:06:16	1.158.2.9.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.8 2019/08/01 14:21:37 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.9.2.2 2020/10/26 02:06:16 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'})) {
@@ -76,15 +81,19 @@ sub handler {
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::content_type($r,'text/html');
     if ($expirepub) {
-        my $c = new CGI::Cookie(-name    => 'lonID',
+        my $c = new CGI::Cookie(-name    => 'lonPubID',
                                 -value   => '',
                                 -expires => '-10y',);
         $r->header_out('Set-cookie' => $c);
     } elsif (($handle eq '') && ($userdom ne '')) {
-        my $c = new CGI::Cookie(-name    => 'lonID',
-                                -value   => '',
-                                -expires => '-10y',);
-        $r->headers_out->add('Set-cookie' => $c);
+        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;
@@ -324,22 +333,36 @@ sub handler {
             &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
         }
         my $spares='';
-	my $last;
-        foreach my $hostid (sort
-			    {
-				&Apache::lonnet::hostname($a) cmp
-				    &Apache::lonnet::hostname($b);
-			    }
-			    keys(%Apache::lonnet::spareid)) {
+        my (@sparehosts,%spareservers);
+        my $sparesref = &Apache::lonnet::this_host_spares($defdom);
+        if (ref($sparesref) eq 'HASH') {
+            foreach my $key (keys(%{$sparesref})) {
+                if (ref($sparesref->{$key}) eq 'ARRAY') {
+                    my @sorted = sort { &Apache::lonnet::hostname($a) cmp
+                                        &Apache::lonnet::hostname($b);
+                                      } @{$sparesref->{$key}};
+                    if (@sorted) {
+                        if ($key eq 'primary') {
+                            unshift(@sparehosts,@sorted);
+                        } elsif ($key eq 'default') {
+                            push(@sparehosts,@sorted);
+                        }
+                    }
+                }
+            }
+        }
+        foreach my $hostid (@sparehosts) {
             next if ($hostid eq $lonhost);
 	    my $hostname = &Apache::lonnet::hostname($hostid);
-	    next if (($last eq $hostname) || ($hostname eq ''));
-            $spares.='<br /><font size="+1"><a href="http://'.
+	    next if (($hostname eq '') || ($spareservers{$hostname}));
+            $spareservers{$hostname} = 1;
+            my $protocol = $Apache::lonnet::protocol{$hostid};
+            $protocol = 'http' if ($protocol ne 'https');
+            $spares.='<br /><span style="font-size: larger;"><a href="'.$protocol.'://'.
                 $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
                 $hostname.'</a>'.
-                ' '.&mt('(preferred)').'</font>'.$/;
-	    $last=$hostname;
+                ' '.&mt('(preferred)').'</span>'.$/;
         }
         if ($spares) {
             $spares.= '<br />';
@@ -351,23 +374,26 @@ sub handler {
 			    &Apache::lonnet::hostname($b);
 		    }
 		    keys(%all_hostnames)) {
-            next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+            next if ($hostid eq $lonhost);
             my $hostname = &Apache::lonnet::hostname($hostid);
-            next if (($last eq $hostname) || ($hostname eq ''));
-            $spares.='<br /><a href="http://'.
+            next if (($hostname eq '') || ($spareservers{$hostname}));
+            $spareservers{$hostname} = 1;
+            my $protocol = $Apache::lonnet::protocol{$hostid};
+            $protocol = 'http' if ($protocol ne 'https');
+            $spares.='<br /><a href="'.$protocol.'://'.
 	             $hostname.
 	             '/adm/login?domain='.$authdomain.'">'.
 	             $hostname.'</a>';
-            $last=$hostname;
          }
          $r->print(
-   '<html>'
-  .'<head><title>'
+   '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+  .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'
+  .'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>'
   .&mt('The LearningOnline Network with CAPA')
   .'</title></head>'
   .'<body bgcolor="#FFFFFF">'
   .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
-  .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
+  .'<img src="/adm/lonKaputt/lonlogo_broken.gif" alt="broken icon" align="right" />'
   .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>');
         if ($spares) {
             $r->print('<p>'.&mt('Please attempt to login to one of the following servers:')