--- loncom/auth/migrateuser.pm 2022/07/08 15:51:15 1.25.2.5.2.6 +++ loncom/auth/migrateuser.pm 2022/08/30 15:32:51 1.25.2.5.2.7 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.25.2.5.2.6 2022/07/08 15:51:15 raeburn Exp $ +# $Id: migrateuser.pm,v 1.25.2.5.2.7 2022/08/30 15:32:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,11 @@ use Apache::lonlogin(); use CGI::Cookie; sub goto_login { - my ($r,$domain) = @_; + my ($r,$domain,$data) = @_; + my $write_to_opener; + if (ref($data) eq 'HASH') { + $write_to_opener = $data->{'lcssowin'}; + } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my $url = '/adm/login'; @@ -46,7 +50,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()); @@ -205,7 +209,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()); @@ -244,7 +248,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'}, @@ -254,6 +258,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') { @@ -287,7 +292,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'}) { @@ -319,11 +324,11 @@ sub handler { &Apache::lonlocal::get_language_handle($r); if ($delete ne 'ok') { - return &goto_login($r); + return &goto_login($r,'',\%data); } if (!defined($data{'username'}) || !defined($data{'domain'})) { - return &goto_login($r); + return &goto_login($r,'',\%data); } my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); if ($data{'ip'} ne $ip) { @@ -338,7 +343,7 @@ sub handler { if (&Apache::lonnet::domain($data{'domain'})) { $udom=$data{'domain'}; } - if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom); } + if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom,\%data); } my $extra_env = &sso_check(\%data); if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) { @@ -563,7 +568,7 @@ sub handler { } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, $home,$desturl,$extra_env,\%form,'', - $expirepub); + $expirepub,$data{'lcssowin'}); } return OK; } @@ -593,7 +598,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; }