version 1.125, 2009/04/14 23:52:07
|
version 1.128, 2009/09/25 13:51:44
|
Line 278 sub sso_login {
|
Line 278 sub sso_login {
|
|
|
my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/); |
my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/); |
|
|
|
my $query = $r->args; |
|
my %form; |
|
if ($query) { |
|
my @items = ('role','symb'); |
|
&Apache::loncommon::get_unprocessed_cgi($query,\@items); |
|
foreach my $item (@items) { |
|
if (defined($env{'form.'.$item})) { |
|
$form{$item} = $env{'form.'.$item}; |
|
} |
|
} |
|
} |
|
|
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = $r->dir_config('lonDefDomain'); |
my $home=&Apache::lonnet::homeserver($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)/) { |
Line 302 sub sso_login {
|
Line 314 sub sso_login {
|
'server' => $r->dir_config('lonHostID'), |
'server' => $r->dir_config('lonHostID'), |
'sso.login' => 1 |
'sso.login' => 1 |
); |
); |
|
foreach my $item ('role','symb') { |
|
if (exists($form{$item})) { |
|
$info{$item} = $form{$item}; |
|
} |
|
} |
if ($r->dir_config("ssodirecturl") == 1) { |
if ($r->dir_config("ssodirecturl") == 1) { |
$info{'origurl'} = $r->uri; |
$info{'origurl'} = $r->uri; |
} |
} |
Line 440 sub handler {
|
Line 457 sub handler {
|
$env{'user.domain'} eq 'public' && |
$env{'user.domain'} eq 'public' && |
$requrl !~ m{^/+(res|public|uploaded)/} && |
$requrl !~ m{^/+(res|public|uploaded)/} && |
$requrl !~ m{^/adm/[^/]+/[^/]+/aboutme/portfolio$ }x && |
$requrl !~ m{^/adm/[^/]+/[^/]+/aboutme/portfolio$ }x && |
|
$requrl !~ m{^/adm/blockingstatus/.*$} && |
$requrl !~ m{^/+adm/(help|logout|restrictedaccess|randomlabel\.png)}) { |
$requrl !~ m{^/+adm/(help|logout|restrictedaccess|randomlabel\.png)}) { |
$env{'request.querystring'}=$r->args; |
$env{'request.querystring'}=$r->args; |
$env{'request.firsturl'}=$requrl; |
$env{'request.firsturl'}=$requrl; |