--- loncom/auth/switchserver.pm	2018/12/26 20:10:21	1.47
+++ loncom/auth/switchserver.pm	2020/12/18 15:23:03	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.47 2018/12/26 20:10:21 raeburn Exp $
+# $Id: switchserver.pm,v 1.52 2020/12/18 15:23:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,9 +56,13 @@ sub init_env {
 sub do_redirect {
     my ($r,$url,$only_body,$extra_text) = @_;
     $r->send_http_header;
+    my $delay = 0.5;
+    if ($only_body) {
+        $delay = 0;
+    }
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
-				       {'redirect'       => [0.5,$url],
+				       {'redirect'       => [$delay,$url],
 					'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
@@ -207,7 +211,8 @@ sub handler {
     } else {
         $logmsg .= " (no role)";
     }
-    $logmsg .= ' '.$ENV{'REMOTE_ADDR'};
+    my $ip = &Apache::lonnet::get_requestor_ip();
+    $logmsg .= ' '.$ip;
     &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
 			 $env{'user.home'},$logmsg);
 
@@ -227,24 +232,30 @@ sub handler {
 	return OK;
     }
 # -------------------------------------------------------- Menu script and info
-	   
+
 # ---------------------------------------------------------------- Get handover
 
-    my $newcookieid;
-    my ($is_balancer,$posshost,$setcookie,$offloadto,$dom_balancers) =
-        &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
+    my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie,$offloadto,$dom_balancers);
+    my $only_body = 0;
+    ($is_balancer,undef,$setcookie,$offloadto,$dom_balancers) =
+        &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'},'switchserver');
     if ($is_balancer && $setcookie && $env{'form.otherserver'}) {
 
         # Set a balancer cookie unless browser already sent LON-CAPA load balancer
         # cookie which points at the target server
         my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);
 
-        unless (($found_server eq $env{'form.otherserver'}) &&
-                ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
+        if (($found_server eq $env{'form.otherserver'}) &&
+            ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
+            $only_body = 1;
+        } else {
             $newcookieid = &balancer_cookieid($r,$env{'form.otherserver'},
                                               $env{'user.name'},$env{'user.domain'});
         }
     }
+    if ((!$is_balancer) && ($env{'request.balancercookie'})) {
+        $otherbalcookie = $env{'request.balancercookie'};
+    }
 
     my %info=('ip'            => $ENV{'REMOTE_ADDR'},
               'domain'        => $env{'user.domain'},
@@ -267,6 +278,8 @@ sub handler {
     }
     if ($newcookieid) {
         $info{'balcookie'} = $newcookieid;
+    } elsif ($otherbalcookie) {
+        $info{'otherbalcookie'} = $otherbalcookie;
     }
     if ($env{'form.origurl'}) {
         $info{'origurl'} = $env{'form.origurl'};
@@ -283,6 +296,12 @@ sub handler {
     if ($env{'request.linkprot'}) {
         $info{'linkprot'} = $env{'request.linkprot'};
     }
+    if ($env{'request.deeplink.login'}) {
+        $info{'deeplink.login'} = $env{'request.deeplink.login'};
+        if ($env{'request.linkkey'}) {
+            $info{'linkkey'} = $env{'request.linkkey'};
+        }
+    }
     if ($env{'request.lti.login'}) {
         $info{'lti.login'} = $env{'request.lti.login'};
     }
@@ -322,7 +341,7 @@ sub handler {
 	'&username='.$env{'user.name'}.
 	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
-    return &do_redirect($r, $url, 0);
+    return &do_redirect($r, $url, $only_body);
 }
 
 1;