version 1.171, 2018/11/24 16:19:04
|
version 1.174, 2018/12/29 23:24:52
|
Line 363 sub sso_login {
|
Line 363 sub sso_login {
|
# login but immediately go to switch server to find us a new |
# login but immediately go to switch server to find us a new |
# machine |
# machine |
&Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); |
&Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); |
|
foreach my $item (keys(%form)) { |
|
$env{'form.'.$item} = $form{$item}; |
|
} |
|
unless ($form{'symb'}) { |
|
unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { |
|
$env{'form.origurl'} = $r->uri; |
|
} |
|
} |
$env{'request.sso.login'} = 1; |
$env{'request.sso.login'} = 1; |
if (defined($r->dir_config("lonSSOReloginServer"))) { |
if (defined($r->dir_config("lonSSOReloginServer"))) { |
$env{'request.sso.reloginserver'} = |
$env{'request.sso.reloginserver'} = |
Line 509 sub handler {
|
Line 517 sub handler {
|
my $preserved; |
my $preserved; |
foreach my $pair (split(/&/,$query)) { |
foreach my $pair (split(/&/,$query)) { |
my ($name, $value) = split(/=/,$pair); |
my ($name, $value) = split(/=/,$pair); |
unless ($name eq 'symb') { |
unless (($name eq 'symb') || ($name eq 'usehttp')) { |
$preserved .= $pair.'&'; |
$preserved .= $pair.'&'; |
} |
} |
if (($env{'request.course.id'}) && ($name eq 'folderpath')) { |
if (($env{'request.course.id'}) && ($name eq 'folderpath')) { |
Line 550 sub handler {
|
Line 558 sub handler {
|
my $lonhost = &Apache::lonnet::host_from_dns($hostname); |
my $lonhost = &Apache::lonnet::host_from_dns($hostname); |
if ($lonhost) { |
if ($lonhost) { |
my $actual = &Apache::lonnet::absolute_url($hostname); |
my $actual = &Apache::lonnet::absolute_url($hostname); |
|
my $exphostname = &Apache::lonnet::hostname($lonhost); |
my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; |
my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; |
unless ($actual eq $expected) { |
unless ($actual eq $expected) { |
$env{'request.use_absolute'} = $expected; |
$env{'request.use_absolute'} = $expected; |