version 1.46, 2020/03/15 23:04:11
|
version 1.49, 2020/12/18 15:23:03
|
Line 319 sub logout {
|
Line 319 sub logout {
|
} |
} |
my %temp=('logout' => time); |
my %temp=('logout' => time); |
&Apache::lonnet::put('email_status',\%temp); |
&Apache::lonnet::put('email_status',\%temp); |
|
my $ip = &Apache::lonnet::get_requestor_ip(); |
&Apache::lonnet::log($env{'user.domain'}, |
&Apache::lonnet::log($env{'user.domain'}, |
$env{'user.name'}, |
$env{'user.name'}, |
$env{'user.home'}, |
$env{'user.home'}, |
"Logout $ENV{'REMOTE_ADDR'}"); |
"Logout $ip"); |
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
|
|
Line 345 sub logout {
|
Line 346 sub logout {
|
} |
} |
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
if (ref($data) eq 'HASH') { |
if (ref($data) eq 'HASH') { |
%user_info=('ip' => $ENV{'REMOTE_ADDR'}, |
%user_info=('ip' => $ip, |
'domain' => $data->{'domain'}, |
'domain' => $data->{'domain'}, |
'username' => $data->{'username'}, |
'username' => $data->{'username'}, |
'home' => $data->{'home'}, |
'home' => $data->{'home'}, |
Line 541 sub do_server_switch {
|
Line 542 sub do_server_switch {
|
} |
} |
|
|
sub log_switch { |
sub log_switch { |
my ($r,$data,$lti_env) = @_; |
my ($r,$data,$lti_env,$ip) = @_; |
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
return unless ((ref($data) eq 'HASH') && (ref($lti_env) eq 'HASH')); |
return unless ((ref($data) eq 'HASH') && (ref($lti_env) eq 'HASH')); |
my $now = time; |
my $now = time; |
Line 557 sub log_switch {
|
Line 558 sub log_switch {
|
} else { |
} else { |
$logmsg .= " (no role)"; |
$logmsg .= " (no role)"; |
} |
} |
$logmsg .= ' '.$ENV{'REMOTE_ADDR'}; |
$logmsg .= ' '.$ip; |
&Apache::lonnet::log($data->{'domain'},$data->{'username'},$data->{'home'},$logmsg); |
&Apache::lonnet::log($data->{'domain'},$data->{'username'},$data->{'home'},$logmsg); |
} |
} |
|
|
Line 587 sub handler {
|
Line 588 sub handler {
|
} |
} |
my ($home,@ids); |
my ($home,@ids); |
@ids=&Apache::lonnet::current_machine_ids(); |
@ids=&Apache::lonnet::current_machine_ids(); |
if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) { |
my $ip = &Apache::lonnet::get_requestor_ip(); |
|
if ($data{'ip'} ne $ip) { |
&Apache::lonnet::logthis('IP change when session migration requested -- was: '. |
&Apache::lonnet::logthis('IP change when session migration requested -- was: '. |
$data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'}); |
$data{'ip'}.'; now: '.$ip.' for '.$data{'username'}.':'.$data{'domain'}); |
return &ip_changed($r,$data{'domain'},$data{'server'},\@ids,\%data); |
return &ip_changed($r,$data{'domain'},$data{'server'},\@ids,\%data); |
} |
} |
if ($data{'loncfail'}) { |
if ($data{'loncfail'}) { |
Line 659 sub handler {
|
Line 661 sub handler {
|
} else { |
} else { |
$extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} }; |
$extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} }; |
} |
} |
|
} elsif (($data{'server'}) && ($data{'otherbalcookie'})) { |
|
my ($balancer,$balcookie) = split(/:/,$data{'otherbalcookie'}); |
|
if (defined(&Apache::lonnet::hostname($balancer)) && $balcookie =~ /^[a-f0-9]{32}$/) { |
|
my $baldom = &Apache::lonnet::host_domain($balancer); |
|
if (&Apache::lonnet::shared_institution($baldom)) { |
|
my $cookieid = join('_',$udom,$data{'username'},$balcookie); |
|
&Apache::lonnet::updatebalcookie($cookieid,$balancer,$data{'server'}); |
|
if (ref($extra_env) eq 'HASH') { |
|
$extra_env->{'request.balancercookie'} = $data{'otherbalcookie'}; |
|
} else { |
|
$extra_env = { 'request.balancercookie' => $data{'otherbalcookie'} }; |
|
} |
|
} |
|
} |
} |
} |
|
|
if (($data{'conlost'}) && ($data{'server'})) { |
if (($data{'conlost'}) && ($data{'server'})) { |
Line 666 sub handler {
|
Line 682 sub handler {
|
my $switchfrom = $data{'server'}; |
my $switchfrom = $data{'server'}; |
if (@conlosts) { |
if (@conlosts) { |
if (grep(/^\Q$switchfrom\E$/,@conlosts)) { |
if (grep(/^\Q$switchfrom\E$/,@conlosts)) { |
&log_switch($r,\%data,$extra_env); |
&log_switch($r,\%data,$extra_env,$ip); |
} |
} |
} |
} |
} |
} |
Line 827 sub handler {
|
Line 843 sub handler {
|
} |
} |
} else { |
} else { |
my $desturl = '/adm/roles'; |
my $desturl = '/adm/roles'; |
if ($data{'origurl'} ne '') { |
if ($data{'lti.login'}) { |
$desturl = $data{'origurl'}; |
if ($data{'lti.selfenrollrole'}) { |
if ($data{'lti.login'}) { |
$desturl .= '?selectrole=1&'. |
$desturl = $data{'origurl'}; |
&escape($data{'lti.selfenrollrole'}).'=1'; |
|
if ($data{'origurl'} ne '') { |
|
$desturl .= '&orgurl='.$data{'origurl'}; |
|
if ($data{'origurl'} =~ m{/default_\d+\.sequence$}) { |
|
$desturl .= '&navmap=1'; |
|
} |
|
} |
|
} elsif ($data{'origurl'} ne '') { |
|
$desturl = $data{'origurl'}; |
if ($desturl =~ m{/default_\d+\.sequence$}) { |
if ($desturl =~ m{/default_\d+\.sequence$}) { |
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; |
$desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; |
} |
} |
} |
} |
|
} elsif ($data{'origurl'} ne '') { |
|
$desturl = $data{'origurl'}; |
if ($data{'linkprot'}) { |
if ($data{'linkprot'}) { |
my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2); |
my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2); |
if ($linkprotector) { |
if ($linkprotector) { |