--- loncom/auth/lonrelaunch.pm 2022/06/26 18:17:01 1.3 +++ loncom/auth/lonrelaunch.pm 2022/08/24 20:58:50 1.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Re-launch guidance for deep linked access with username mismatch # -# $Id: lonrelaunch.pm,v 1.3 2022/06/26 18:17:01 raeburn Exp $ +# $Id: lonrelaunch.pm,v 1.4 2022/08/24 20:58:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -91,22 +91,26 @@ sub handler { $url .= '?ltoken='.$env{'form.rtoken'}; $r->print(&Apache::loncommon::start_page('Updating session',undef, {'only_body' => 1, - 'redirect' => [1,$url]}). + 'redirect' => [1,$url,'',$data{'lcssowin'}]}). '

'.&mt('Updating old session information').'

'. &Apache::loncommon::end_page()); return OK; } } } + my $args = {'only_body' => 1}; + if ($data{'lcssowin'}) { + $args->{'redirect'} = [1,$data{'origurl'},'',$data{'lcssowin'}]; + } if ($data{'linkprot'}) { - $r->print(&Apache::loncommon::start_page('Updating session',undef,{'only_body' => 1})); + $r->print(&Apache::loncommon::start_page('Updating session',undef,$args)); if ($data{'linkprotuser'} ne '') { $r->print(&mt('Although your credentials were authenticated, the username you entered did not match what was expected [_1] from the link you followed',"($data{'linkprotuser'})")); } else { $r->print(&mt('Expired any existing session')); } } else { - $r->print(&Apache::loncommon::start_page('Session removed',undef,{'only_body' => 1})); + $r->print(&Apache::loncommon::start_page('Session removed',undef,$args)); $r->print(&mt('Expired any existing session')); } $r->print(&Apache::loncommon::end_page());