--- loncom/auth/switchserver.pm	2023/01/23 01:59:24	1.35.2.6.2.5
+++ loncom/auth/switchserver.pm	2024/10/09 15:33:08	1.35.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.35.2.6.2.5 2023/01/23 01:59:24 raeburn Exp $
+# $Id: switchserver.pm,v 1.35.2.9 2024/10/09 15:33:08 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;
@@ -54,7 +56,7 @@ sub init_env {
 }
 
 sub do_redirect {
-    my ($r,$url,$only_body,$extra_text,$write_to_opener) = @_;
+    my ($r,$url,$only_body,$extra_text) = @_;
     $r->send_http_header;
     my $delay = 0.5;
     if ($only_body && !$extra_text) {
@@ -62,8 +64,11 @@ sub do_redirect {
     }
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
-				       {'redirect'       => [$delay,$url,'',$write_to_opener,1],
-					'only_body'      => $only_body,});
+				       {'redirect'       => [$delay,$url,'',1],
+					'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')) {
@@ -97,12 +102,12 @@ sub flush_course_logs {
 
 sub handler {
     my ($r) = @_;
-
+    
     my $handle=&init_env($r);
     if (!defined($handle)) { return FORBIDDEN; }
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-				['otherserver','role','origurl','symb','lcssowin','edit']);
+				['otherserver','role','origurl','symb','edit']);
 
     my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     if (! $env{'form.otherserver'}) {
@@ -267,6 +272,8 @@ sub handler {
     }
 # -------------------------------------------------------- Menu script and info
 
+    my $windowinfo = &Apache::lonmenu::close();
+
 # ---------------------------------------------------------------- Get handover
 
     my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie);
@@ -304,18 +311,11 @@ sub handler {
     }
     if ($env{'form.origurl'}) {
         $info{'origurl'} = $env{'form.origurl'};
-        if ($env{'form.origurl'} eq '/adm/email') {
-            if ($env{'request.display'} && ($env{'request.mailrecip'} eq "$env{'user.name'}:$env{'user.domain'}")) {
-                $info{'display'} = &escape($env{'request.display'});
-                $info{'mailrecip'} = &escape($env{'request.mailrecip'});
-            }
-        }
     }
     if ($env{'form.symb'}) {
         $info{'symb'} = $env{'form.symb'};
     }
-    my $ssologoutscript = '';
-    my $write_to_opener;
+    my $ssologoutscript = ''; 
     if ($env{'request.sso.login'}) {
 	$info{'sso.login'} = $env{'request.sso.login'};
         if (defined($r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) {
@@ -334,32 +334,13 @@ sub handler {
     if ($env{'request.sso.reloginserver'}) {
         $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
     }
-    if ($env{'request.linkprot'}) {
-        $info{'linkprot'} = $env{'request.linkprot'};
-        foreach my $item ('linkprotuser','linkprotexit') {
-            if ($env{'request.'.$item}) {
-                $info{$item} = $env{'request.'.$item};
-            }
-        }
-    } elsif ($env{'request.linkkey'} ne '') {
-        $info{'linkkey'} = $env{'request.linkkey'};
-    }
-    if ($env{'request.deeplink.login'}) {
-        $info{'deeplink.login'} = $env{'request.deeplink.login'};
-    }
     my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
-    my @args = ("domain=$env{'user.domain'}",
-                "username=$env{'user.name'}",
-                "token=$token");
-    my $url = $protocol.'://'.$switch_to.'/adm/login?';
-    if ($env{'form.lcssowin'}) {
-        $url .= join('&',@args);
-        $only_body = 1;
-    } else {
-        $url .= join('&',@args);
-    }
+    my $url =$protocol.'://'.$switch_to.'/adm/login?'.
+	'domain='.$env{'user.domain'}.
+	'&username='.$env{'user.name'}.
+	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
-    return &do_redirect($r, $url, $only_body, $ssologoutscript, $env{'form.lcssowin'});
+    return &do_redirect($r, $url, $only_body, $windowinfo.$ssologoutscript);
 }
 
 1;