--- loncom/auth/switchserver.pm	2023/01/23 01:59:24	1.35.2.6.2.5
+++ 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.5 2023/01/23 01:59:24 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')) {
@@ -242,6 +247,10 @@ sub handler {
     my $logmsg = "Switch Server to $env{'form.otherserver'}";
     if ($env{'form.role'}) {
         $logmsg .= " with role: $env{'form.role'}";
+    } elsif (($env{'form.lti.reqcrs'}) && ($env{'form.lti.reqrole'} eq 'cc')) {
+        $logmsg .= " to create new LTI course";
+    } elsif ($env{'form.lti.selfenrollrole'}) {
+        $logmsg .= " to selfenroll with role: $env{'form.lti.selfenrollrole'}";
     } else {
         $logmsg .= " (no role)";
     }
@@ -267,6 +276,8 @@ sub handler {
     }
 # -------------------------------------------------------- Menu script and info
 
+    my $windowinfo = &Apache::lonmenu::close();
+
 # ---------------------------------------------------------------- Get handover
 
     my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie);
@@ -336,7 +347,7 @@ sub handler {
     }
     if ($env{'request.linkprot'}) {
         $info{'linkprot'} = $env{'request.linkprot'};
-        foreach my $item ('linkprotuser','linkprotexit') {
+        foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
             if ($env{'request.'.$item}) {
                 $info{$item} = $env{'request.'.$item};
             }
@@ -347,6 +358,39 @@ sub handler {
     if ($env{'request.deeplink.login'}) {
         $info{'deeplink.login'} = $env{'request.deeplink.login'};
     }
+    if ($env{'request.lti.login'}) {
+        $info{'lti.login'} = $env{'request.lti.login'};
+    }
+    if ($env{'request.lti.uri'}) {
+        $info{'lti.uri'} = $env{'request.lti.uri'};
+    }
+    if ($env{'request.lti.reqcrs'}) {
+        $info{'lti.reqcrs'} = $env{'request.lti.reqcrs'};
+    }
+    if ($env{'request.lti.reqrole'}) {
+        $info{'lti.reqrole'} = $env{'request.lti.reqrole'};
+    }
+    if ($env{'request.lti.selfenrollrole'}) {
+        $info{'lti.selfenrollrole'} = $env{'request.lti.selfenrollrole'};
+    }
+    if ($env{'request.lti.sourcecrs'}) {
+        $info{'lti.sourcecrs'} = $env{'request.lti.sourcecrs'};
+    }
+    if ($env{'request.lti.passbackid'}) {
+        $info{'lti.passbackid'} = $env{'request.lti.passbackid'};
+    }
+    if ($env{'request.lti.passbackurl'}) {
+        $info{'lti.passbackurl'} = $env{'request.lti.passbackurl'};
+    }
+    if ($env{'request.lti.rosterid'}) {
+        $info{'lti.rosterid'} = $env{'request.lti.rosterid'};
+    }
+    if ($env{'request.lti.rosterurl'}) {
+        $info{'lti.rosterurl'} = $env{'request.lti.rosterurl'};
+    }
+    if ($env{'request.lti.target'}) {
+        $info{'lti.target'} = $env{'request.lti.target'};
+    }
     my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
     my @args = ("domain=$env{'user.domain'}",
                 "username=$env{'user.name'}",
@@ -359,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;