--- loncom/auth/lonlogin.pm	2022/06/18 02:10:18	1.199
+++ loncom/auth/lonlogin.pm	2022/06/26 04:03:47	1.200
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.199 2022/06/18 02:10:18 raeburn Exp $
+# $Id: lonlogin.pm,v 1.200 2022/06/26 04:03:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -262,7 +262,6 @@ sub handler {
                 if ($info{'linkprotuser'} ne '') {
                     $linkprotuser = $info{'linkprotuser'};
                 } 
-                my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
             } else {
                 $linkprot = $env{'form.linkprot'};
                 $linkprotuser = $env{'form.linkprotuser'};
@@ -277,6 +276,9 @@ sub handler {
                                           linkprot => $linkprot,
                                           linkprotuser => $linkprotuser,
                                        );    
+                    if ($env{'form.ltoken'}) {
+                        my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                    }
                     &Apache::migrateuser::logout($r,$ip,$handle,undef,undef,\%linkprotinfo);
                     return OK;
                 }
@@ -325,6 +327,9 @@ sub handler {
                 }
             }
         }
+        if ($env{'form.ltoken'}) {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+        }
 	$r->print(
                   $start_page
                  .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
@@ -1149,6 +1154,7 @@ sub redirect_page {
         $path = '/'.$path;
     }
     my $url = $protocol.'://'.$hostname.$path;
+    my $args = {};
     if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
         $url = $protocol.'://'.$hostname.$env{'form.firsturl'};
         if (($env{'form.ltoken'}) || ($env{'form.linkprot'} ne '') ||
@@ -1157,11 +1163,13 @@ sub redirect_page {
             if ($env{'form.ltoken'}) {
                 %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                $args->{'only_body'} = 1;
             } elsif ($env{'form.linkprot'}) {
                 $link_info{'linkprot'} = $env{'form.linkprot'};
                 if ($env{'form.linkprotuser'}) {
                     $link_info{'linkprotuser'} = $env{'form.linkprotuser'};
                 }
+                $args->{'only_body'} = 1;
             } elsif ($env{'form.linkkey'} ne '') {
                 $link_info{'linkkey'} = $env{'form.linkkey'};
             }
@@ -1196,8 +1204,8 @@ sub redirect_page {
         }
         $url .= $querystring;
     }
-    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
-                                                    {'redirect' => [0,$url],});
+    $args->{'redirect'} = [0,$url];
+    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,$args);
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
 }