version 1.94, 2006/08/30 16:50:23
|
version 1.99, 2006/09/19 15:24:57
|
Line 44 sub cleanup {
|
Line 44 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 153 sub sso_login {
|
Line 154 sub sso_login {
|
return undef; |
return undef; |
} |
} |
|
|
|
my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/); |
|
|
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = $r->dir_config('lonDefDomain'); |
my $home=&Apache::lonnet::homeserver($r->user,$domain); |
my $home=&Apache::lonnet::homeserver($user,$domain); |
if ($home !~ /(con_lost|no_host|no_such_host)/) { |
if ($home !~ /(con_lost|no_host|no_such_host)/) { |
if ($r->dir_config("lonBalancer") eq 'yes') { |
if ($r->dir_config("lonBalancer") eq 'yes') { |
# login but immeaditly go to switch server to find us a new |
# login but immeaditly go to switch server to find us a new |
# machine |
# machine |
&Apache::lonauth::success($r,$r->user,$domain,$home,'noredirect'); |
&Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); |
$r->internal_redirect('/adm/switchserver'); |
$r->internal_redirect('/adm/switchserver'); |
} 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 %info=('ip' => $r->connection->remote_ip(), |
my %info=('ip' => $r->connection->remote_ip(), |
'domain' => $domain, |
'domain' => $domain, |
'username' => $r->user, |
'username' => $user, |
'server' => $r->dir_config('lonHostID'), |
'server' => $r->dir_config('lonHostID'), |
'sso.login' => 1 |
'sso.login' => 1 |
); |
); |
Line 177 sub sso_login {
|
Line 180 sub sso_login {
|
$r->internal_redirect('/adm/migrateuser'); |
$r->internal_redirect('/adm/migrateuser'); |
} |
} |
return OK; |
return OK; |
} elsif (defined($r->dir_config('lonSSOUserUnkownRedirect'))) { |
} elsif (defined($r->dir_config('lonSSOUserUnknownRedirect'))) { |
$r->internal_redirect($r->dir_config('lonSSOUserUnkownRedirect')); |
$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); |
return OK; |
return OK; |
} |
} |
return undef; |
return undef; |
Line 198 sub handler {
|
Line 201 sub handler {
|
$handle=~s/\W//g; |
$handle=~s/\W//g; |
} |
} |
|
|
if (my $result = &sso_login($r,$lonid,$handle)) { |
my $result = &sso_login($r,$lonid,$handle); |
|
if (defined($result) { |
return $result |
return $result |
} |
} |
|
|
Line 239 sub handler {
|
Line 243 sub handler {
|
|
|
# ---------------------------------------------------------------- Check access |
# ---------------------------------------------------------------- Check access |
my $now = time; |
my $now = time; |
if ($requrl!~/^\/adm|public|prtspool\//) { |
if ($requrl !~ m{^/(?:adm|public|prtspool)/} |
|
|| $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) { |
my $access=&Apache::lonnet::allowed('bre',$requrl); |
my $access=&Apache::lonnet::allowed('bre',$requrl); |
if ($access eq '1') { |
if ($access eq '1') { |
$env{'user.error.msg'}="$requrl:bre:0:0:Choose Course"; |
$env{'user.error.msg'}="$requrl:bre:0:0:Choose Course"; |