--- loncom/auth/migrateuser.pm	2022/06/18 02:10:18	1.61
+++ loncom/auth/migrateuser.pm	2022/06/26 04:03:47	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.61 2022/06/18 02:10:18 raeburn Exp $
+# $Id: migrateuser.pm,v 1.62 2022/06/26 04:03:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -336,7 +336,7 @@ sub logout {
         $r->headers_out->add('Set-cookie' => $c);
     }
     my $lonhost = $r->dir_config('lonHostID');
-    my ($url,$token,%info,%user_info);
+    my ($url,$token,$delay,%info,%user_info);
     if (ref($data) eq 'HASH') {
         %user_info=('ip'       => $ip,
                     'domain'   => $data->{'domain'},
@@ -347,6 +347,7 @@ sub logout {
                     'symb'     => $data->{'symb'},
                     'server'   => $lonhost);
     }
+    $delay = 0.1;
     if (ref($linkprot_info) eq 'HASH') {
         if ($linkprot_info->{'linkprotuser'} ne '') {
             $token = &Apache::lonnet::tmpput($linkprot_info,$lonhost);
@@ -361,6 +362,7 @@ sub logout {
             $token = &Apache::lonnet::tmpput(\%info,$lonhost);
             $url = '/adm/migrateuser?token='.$token;
         }
+        $delay = 0;
     } else {
         my %lti_info;
         if (ref($lti_env) eq 'HASH') {
@@ -377,7 +379,7 @@ sub logout {
     $r->send_http_header;
     $r->print(
         &Apache::loncommon::start_page('Updating Session ...',undef,
-                                       {'redirect'       => [0.1,$url],
+                                       {'redirect'       => [$delay,$url],
                                         'only_body'      => 1,}).
         &Apache::loncommon::end_page());
     if ($env{'request.balancercookie'}) {
@@ -900,6 +902,9 @@ sub handler {
                     my %info;
                     if ($env{'request.linkprot'}) {
                         $info{'linkprot'} = $env{'request.linkprot'};
+                        if ($data{'linkprotuser'}) {
+                            $info{'linkprotuser'} = $data{'linkprotuser'};
+                        }
                     } elsif ($env{'request.linkkey'} ne '') {
                         $info{'linkkey'} = $env{'request.linkkey'};
                     }
@@ -952,6 +957,9 @@ sub handler {
                                           'request.linkprot' => $data{'linkprot'}};
                         }
                     }
+                    if ($data{'linkprotuser'} ne '') {
+                        $form{'linkprotuser'} = $data{'linkprotuser'};
+                    }
                 } elsif ($data{'linkkey'} ne '') {
                     if (ref($extra_env) eq 'HASH') {
                         $extra_env->{'user.deeplinkkey'} = $data{'linkkey'};
@@ -1049,6 +1057,9 @@ sub handler {
             }
             if ($data{'linkprot'}) {
                 $extra_env->{'request.linkprot'} = $data{'linkprot'};
+                if ($data{'linkprotuser'}) {
+                    $form{'request.linkprotuser'} = $data{'linkprotuser'};
+                }
             } elsif ($data{'linkkey'} ne '') {
                 $extra_env->{'request.linkkey'} = $data{'linkkey'};
             }