version 1.159.2.4, 2016/08/16 20:36:45
|
version 1.160, 2014/12/01 22:52:54
|
Line 109 sub cleanup {
|
Line 109 sub cleanup {
|
my ($r)=@_; |
my ($r)=@_; |
if (! $r->is_initial_req()) { return DECLINED; } |
if (! $r->is_initial_req()) { return DECLINED; } |
&Apache::lonnet::save_cache(); |
&Apache::lonnet::save_cache(); |
|
&Apache::lontexconvert::jsMath_reset(); |
return OK; |
return OK; |
} |
} |
|
|
Line 289 sub sso_login {
|
Line 290 sub sso_login {
|
return undef; |
return undef; |
} |
} |
|
|
my ($user) = ($r->user =~ m/^($match_username)$/); |
my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/); |
if ($user eq '') { |
|
return undef; |
|
} |
|
|
|
my $query = $r->args; |
my $query = $r->args; |
my %form; |
my %form; |
Line 352 sub sso_login {
|
Line 350 sub sso_login {
|
} else { |
} else { |
# need to login them in, so generate the need data that |
# need to login them in, so generate the need data that |
# migrate expects to do login |
# migrate expects to do login |
my $ip = $r->get_remote_host(); |
my $ip; |
|
my $c = $r->connection; |
|
eval { |
|
$ip = $c->remote_ip(); |
|
}; |
|
if ($@) { |
|
$ip = $c->client_ip(); |
|
} |
my %info=('ip' => $ip, |
my %info=('ip' => $ip, |
'domain' => $domain, |
'domain' => $domain, |
'username' => $user, |
'username' => $user, |
Line 743 sub handler {
|
Line 748 sub handler {
|
# ------------------------------------ See if this is a viewable portfolio file |
# ------------------------------------ See if this is a viewable portfolio file |
if (&Apache::lonnet::is_portfolio_url($requrl)) { |
if (&Apache::lonnet::is_portfolio_url($requrl)) { |
my $clientip = $r->get_remote_host(); |
my $clientip = $r->get_remote_host(); |
my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); |
my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); |
if ($access eq 'A') { |
if ($access eq 'A') { |
&Apache::restrictedaccess::setup_handler($r); |
&Apache::restrictedaccess::setup_handler($r); |
return OK; |
return OK; |