version 1.61, 2022/06/18 02:10:18
|
version 1.64, 2022/07/02 19:55:15
|
Line 285 sub ip_changed {
|
Line 285 sub ip_changed {
|
'username' => $dataref->{'username'}, |
'username' => $dataref->{'username'}, |
'sessionserver' => $lonhost, |
'sessionserver' => $lonhost, |
); |
); |
my @names = ('origurl','symb','role','linkprotuser','linkprot','linkkey'); |
my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey'); |
foreach my $name (@names) { |
foreach my $name (@names) { |
if ($dataref->{$name} ne '') { |
if ($dataref->{$name} ne '') { |
$info{$name} = $dataref->{$name}; |
$info{$name} = $dataref->{$name}; |
Line 336 sub logout {
|
Line 336 sub logout {
|
$r->headers_out->add('Set-cookie' => $c); |
$r->headers_out->add('Set-cookie' => $c); |
} |
} |
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
my ($url,$token,%info,%user_info); |
my ($url,$token,$delay,%info,%user_info); |
if (ref($data) eq 'HASH') { |
if (ref($data) eq 'HASH') { |
%user_info=('ip' => $ip, |
%user_info=('ip' => $ip, |
'domain' => $data->{'domain'}, |
'domain' => $data->{'domain'}, |
Line 347 sub logout {
|
Line 347 sub logout {
|
'symb' => $data->{'symb'}, |
'symb' => $data->{'symb'}, |
'server' => $lonhost); |
'server' => $lonhost); |
} |
} |
|
$delay = 0.1; |
if (ref($linkprot_info) eq 'HASH') { |
if (ref($linkprot_info) eq 'HASH') { |
if ($linkprot_info->{'linkprotuser'} ne '') { |
if ($linkprot_info->{'linkprotuser'} ne '') { |
$token = &Apache::lonnet::tmpput($linkprot_info,$lonhost); |
$token = &Apache::lonnet::tmpput($linkprot_info,$lonhost); |
Line 361 sub logout {
|
Line 362 sub logout {
|
$token = &Apache::lonnet::tmpput(\%info,$lonhost); |
$token = &Apache::lonnet::tmpput(\%info,$lonhost); |
$url = '/adm/migrateuser?token='.$token; |
$url = '/adm/migrateuser?token='.$token; |
} |
} |
|
$delay = 0; |
} else { |
} else { |
my %lti_info; |
my %lti_info; |
if (ref($lti_env) eq 'HASH') { |
if (ref($lti_env) eq 'HASH') { |
Line 377 sub logout {
|
Line 379 sub logout {
|
$r->send_http_header; |
$r->send_http_header; |
$r->print( |
$r->print( |
&Apache::loncommon::start_page('Updating Session ...',undef, |
&Apache::loncommon::start_page('Updating Session ...',undef, |
{'redirect' => [0.1,$url], |
{'redirect' => [$delay,$url], |
'only_body' => 1,}). |
'only_body' => 1,}). |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
if ($env{'request.balancercookie'}) { |
if ($env{'request.balancercookie'}) { |
Line 742 sub handler {
|
Line 744 sub handler {
|
unless ($env{'request.linkprot'} eq $data{'linkprot'}) { |
unless ($env{'request.linkprot'} eq $data{'linkprot'}) { |
$checklaunch = 1; |
$checklaunch = 1; |
} |
} |
|
unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { |
|
$checklaunch = 1; |
|
} |
unless ($env{'request.linkkey'} eq $data{'linkkey'}) { |
unless ($env{'request.linkkey'} eq $data{'linkkey'}) { |
$checklaunch = 1; |
$checklaunch = 1; |
} |
} |
Line 753 sub handler {
|
Line 758 sub handler {
|
if (($env{'user.name'} ne $data{'username'}) || |
if (($env{'user.name'} ne $data{'username'}) || |
($env{'user.domain'} ne $data{'domain'})) { |
($env{'user.domain'} ne $data{'domain'})) { |
my %linkprot_env; |
my %linkprot_env; |
foreach my $item ('linkprot','deeplink.login') { |
foreach my $item ('linkprot','linkprotexit','deeplink.login') { |
if ($data{$item}) { |
if ($data{$item}) { |
$linkprot_env{$item} = $data{$item}; |
$linkprot_env{$item} = $data{$item}; |
} |
} |
Line 762 sub handler {
|
Line 767 sub handler {
|
return OK; |
return OK; |
} |
} |
&Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); |
&Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); |
|
if ($data{'linkprotexit'}) { |
|
&Apache::lonnet::appenv({'request.linkprotexit' => $data{'linkprotexit'}}); |
|
} |
if ($env{'request.linkkey'}) { |
if ($env{'request.linkkey'}) { |
&Apache::lonnet::delenv('request.linkkey'); |
&Apache::lonnet::delenv('request.linkkey'); |
} |
} |
Line 900 sub handler {
|
Line 908 sub handler {
|
my %info; |
my %info; |
if ($env{'request.linkprot'}) { |
if ($env{'request.linkprot'}) { |
$info{'linkprot'} = $env{'request.linkprot'}; |
$info{'linkprot'} = $env{'request.linkprot'}; |
|
foreach my $item ('linkprotuser','linkprotexit') { |
|
if ($data{$item}) { |
|
$info{$item} = $data{$item}; |
|
} |
|
} |
} elsif ($env{'request.linkkey'} ne '') { |
} elsif ($env{'request.linkkey'} ne '') { |
$info{'linkkey'} = $env{'request.linkkey'}; |
$info{'linkkey'} = $env{'request.linkkey'}; |
} |
} |
Line 951 sub handler {
|
Line 964 sub handler {
|
'user.linkproturi' => $linkuri, |
'user.linkproturi' => $linkuri, |
'request.linkprot' => $data{'linkprot'}}; |
'request.linkprot' => $data{'linkprot'}}; |
} |
} |
|
if ($data{'linkprotexit'}) { |
|
$extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; |
|
} |
|
} |
|
foreach my $item ('linkprotuser','linkprotexit') { |
|
if ($data{$item} ne '') { |
|
$form{$item} = $data{$item}; |
|
} |
} |
} |
} elsif ($data{'linkkey'} ne '') { |
} elsif ($data{'linkkey'} ne '') { |
if (ref($extra_env) eq 'HASH') { |
if (ref($extra_env) eq 'HASH') { |
Line 1049 sub handler {
|
Line 1070 sub handler {
|
} |
} |
if ($data{'linkprot'}) { |
if ($data{'linkprot'}) { |
$extra_env->{'request.linkprot'} = $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}; |
|
} |
|
} |
} elsif ($data{'linkkey'} ne '') { |
} elsif ($data{'linkkey'} ne '') { |
$extra_env->{'request.linkkey'} = $data{'linkkey'}; |
$extra_env->{'request.linkkey'} = $data{'linkkey'}; |
} |
} |