--- loncom/auth/switchserver.pm	2023/07/05 21:13:07	1.35.2.6.2.6
+++ loncom/auth/switchserver.pm	2024/10/09 15:49:17	1.35.2.6.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.35.2.6.2.6 2023/07/05 21:13:07 raeburn Exp $
+# $Id: switchserver.pm,v 1.35.2.6.2.8 2024/10/09 15:49:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,8 @@ package Apache::switchserver;
 use strict;
 use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet;
+use Apache::loncommon;
+use Apache::lonmenu;
 use Digest::MD5 qw(md5_hex);
 use CGI::Cookie();
 use Apache::lonlocal;
@@ -63,7 +65,10 @@ sub do_redirect {
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
 				       {'redirect'       => [$delay,$url,'',$write_to_opener,1],
-					'only_body'      => $only_body,});
+					'only_body'      => $only_body,
+                                        'switchserver'   => 1,
+                                        'links_disabled' => 1,
+                                        'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
     unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {
@@ -271,6 +276,8 @@ sub handler {
     }
 # -------------------------------------------------------- Menu script and info
 
+    my $windowinfo = &Apache::lonmenu::close();
+
 # ---------------------------------------------------------------- Get handover
 
     my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie);
@@ -396,7 +403,8 @@ sub handler {
         $url .= join('&',@args);
     }
 # --------------------------------------------------------------- Screen Output
-    return &do_redirect($r, $url, $only_body, $ssologoutscript, $env{'form.lcssowin'});
+    return &do_redirect($r, $url, $only_body, $windowinfo.$ssologoutscript,
+                        $env{'form.lcssowin'});
 }
 
 1;