--- loncom/auth/switchserver.pm	2021/12/12 21:07:21	1.35.2.6
+++ loncom/auth/switchserver.pm	2022/08/30 16:20:17	1.35.2.6.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.35.2.6 2021/12/12 21:07:21 raeburn Exp $
+# $Id: switchserver.pm,v 1.35.2.6.2.3 2022/08/30 16:20:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,7 +54,7 @@ sub init_env {
 }
 
 sub do_redirect {
-    my ($r,$url,$only_body,$extra_text) = @_;
+    my ($r,$url,$only_body,$extra_text,$write_to_opener) = @_;
     $r->send_http_header;
     my $delay = 0.5;
     if ($only_body && !$extra_text) {
@@ -62,7 +62,7 @@ sub do_redirect {
     }
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
-				       {'redirect'       => [$delay,$url],
+				       {'redirect'       => [$delay,$url,'',$write_to_opener],
 					'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
@@ -97,12 +97,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']);
+				['otherserver','role','origurl','symb','lcssowin']);
 
     my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     if (! $env{'form.otherserver'}) {
@@ -270,7 +270,8 @@ sub handler {
     if ($env{'form.symb'}) {
         $info{'symb'} = $env{'form.symb'};
     }
-    my $ssologoutscript = ''; 
+    my $ssologoutscript = '';
+    my $write_to_opener;
     if ($env{'request.sso.login'}) {
 	$info{'sso.login'} = $env{'request.sso.login'};
         if (defined($r->dir_config("lonSSOUserLogoutScriptFile_$info{domain}"))) {
@@ -289,13 +290,32 @@ 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 $url =$protocol.'://'.$switch_to.'/adm/login?'.
-	'domain='.$env{'user.domain'}.
-	'&username='.$env{'user.name'}.
-	'&token='.$token;
+    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);
+    }
 # --------------------------------------------------------------- Screen Output
-    return &do_redirect($r, $url, $only_body, $ssologoutscript);
+    return &do_redirect($r, $url, $only_body, $ssologoutscript, $env{'form.lcssowin'});
 }
 
 1;