--- loncom/auth/migrateuser.pm 2022/07/02 19:55:15 1.64 +++ loncom/auth/migrateuser.pm 2022/08/24 20:58:50 1.65 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.64 2022/07/02 19:55:15 raeburn Exp $ +# $Id: migrateuser.pm,v 1.65 2022/08/24 20:58:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,6 +42,10 @@ use CGI::Cookie; sub goto_login { my ($r,$domain,$data) = @_; + my $write_to_opener; + if (ref($data) eq 'HASH') { + $write_to_opener = $data->{'lcssowin'}; + } if ((ref($data) eq 'HASH') && ($data->{'lti.login'})) { &Apache::ltiauth::invalid_request($r,'22'); } else { @@ -52,7 +56,7 @@ sub goto_login { $url .= '?domain='.$domain; } $r->print(&Apache::loncommon::start_page('Going to login',undef, - {'redirect' => [0,$url],}). + {'redirect' => [0,$url,'',$write_to_opener],}). '

'.&mt('One moment please...').'

'. '

'.&mt('Transferring to login page.').'

'. &Apache::loncommon::end_page()); @@ -297,7 +301,7 @@ sub ip_changed { } $r->print(&Apache::loncommon::start_page($title,undef, {'redirect' => - [2,$url],}). + [2,$url,'',$dataref->{'lcssowin'}],}). '

'.&mt('One moment please...').'

'. '

'.$message.'

'. &Apache::loncommon::end_page()); @@ -336,7 +340,7 @@ sub logout { $r->headers_out->add('Set-cookie' => $c); } my $lonhost = $r->dir_config('lonHostID'); - my ($url,$token,$delay,%info,%user_info); + my ($url,$token,$delay,$write_to_opener,%info,%user_info); if (ref($data) eq 'HASH') { %user_info=('ip' => $ip, 'domain' => $data->{'domain'}, @@ -346,6 +350,7 @@ sub logout { 'origurl' => $data->{'origurl'}, 'symb' => $data->{'symb'}, 'server' => $lonhost); + $write_to_opener = $data->{'lcssowin'}; } $delay = 0.1; if (ref($linkprot_info) eq 'HASH') { @@ -379,7 +384,7 @@ sub logout { $r->send_http_header; $r->print( &Apache::loncommon::start_page('Updating Session ...',undef, - {'redirect' => [$delay,$url], + {'redirect' => [$delay,$url,'',$write_to_opener], 'only_body' => 1,}). &Apache::loncommon::end_page()); if ($env{'request.balancercookie'}) { @@ -1002,7 +1007,7 @@ sub handler { } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, $home,$desturl,$extra_env,\%form,$skipcritical,'', - $expirepub); + $expirepub,$data{'lcssowin'}); } return OK; } @@ -1083,7 +1088,7 @@ sub handler { } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, - $next_url,$extra_env,\%form,'',$cid); + $next_url,$extra_env,\%form,'',$cid,'',$data{'lcssowin'}); } return OK; }