--- loncom/auth/migrateuser.pm 2022/06/30 21:04:13 1.63 +++ loncom/auth/migrateuser.pm 2022/07/02 19:55:15 1.64 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.63 2022/06/30 21:04:13 raeburn Exp $ +# $Id: migrateuser.pm,v 1.64 2022/07/02 19:55:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -744,6 +744,9 @@ sub handler { unless ($env{'request.linkprot'} eq $data{'linkprot'}) { $checklaunch = 1; } + unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { + $checklaunch = 1; + } unless ($env{'request.linkkey'} eq $data{'linkkey'}) { $checklaunch = 1; } @@ -755,7 +758,7 @@ sub handler { if (($env{'user.name'} ne $data{'username'}) || ($env{'user.domain'} ne $data{'domain'})) { my %linkprot_env; - foreach my $item ('linkprot','deeplink.login') { + foreach my $item ('linkprot','linkprotexit','deeplink.login') { if ($data{$item}) { $linkprot_env{$item} = $data{$item}; } @@ -764,6 +767,9 @@ sub handler { return OK; } &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); + if ($data{'linkprotexit'}) { + &Apache::lonnet::appenv({'request.linkprotexit' => $data{'linkprotexit'}}); + } if ($env{'request.linkkey'}) { &Apache::lonnet::delenv('request.linkkey'); } @@ -958,6 +964,9 @@ sub handler { 'user.linkproturi' => $linkuri, 'request.linkprot' => $data{'linkprot'}}; } + if ($data{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; + } } foreach my $item ('linkprotuser','linkprotexit') { if ($data{$item} ne '') { @@ -1061,6 +1070,9 @@ sub handler { } if ($data{'linkprot'}) { $extra_env->{'request.linkprot'} = $data{'linkprot'}; + if ($data{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; + } foreach my $item ('linkprotuser','linkprotexit') { if ($data{$item}) { $form{'request.'.$item} = $data{$item};