version 1.155, 2014/05/05 23:17:12
|
version 1.157, 2014/06/17 23:22:10
|
Line 283 sub sso_login {
|
Line 283 sub sso_login {
|
my ($r,$handle,$username) = @_; |
my ($r,$handle,$username) = @_; |
|
|
my $lonidsdir=$r->dir_config('lonIDsDir'); |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
if (($r->user eq '') || ($username ne '') || |
if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') || |
(defined($env{'user.name'}) && (defined($env{'user.domain'})) |
(defined($env{'user.name'}) && (defined($env{'user.domain'})) |
&& ($handle ne ''))) { |
&& ($handle ne ''))) { |
# not an SSO case or already logged in |
# not an SSO case or already logged in |
Line 473 sub handler {
|
Line 473 sub handler {
|
} |
} |
$env{'request.filename'} = $r->filename; |
$env{'request.filename'} = $r->filename; |
$env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl); |
$env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl); |
my $suppext; |
my ($suppext,$checkabsolute); |
if ($requrl =~ m{^/adm/wrapper/ext/}) { |
if ($requrl =~ m{^/adm/wrapper/ext/}) { |
my $query = $r->args; |
my $query = $r->args; |
if ($query) { |
if ($query) { |
Line 494 sub handler {
|
Line 494 sub handler {
|
$env{'request.external.querystring'} = $preserved; |
$env{'request.external.querystring'} = $preserved; |
} |
} |
} |
} |
|
if ($env{'request.course.id'}) { |
|
$checkabsolute = 1; |
|
} |
} elsif ($env{'request.course.id'} && |
} elsif ($env{'request.course.id'} && |
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || |
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || |
($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { |
($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { |
Line 508 sub handler {
|
Line 511 sub handler {
|
} |
} |
} |
} |
} |
} |
|
if ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}) { |
|
$checkabsolute = 1; |
|
} |
|
} |
|
if ($checkabsolute) { |
|
my $hostname = $r->hostname(); |
|
my $lonhost = &Apache::lonnet::host_from_dns($hostname); |
|
if ($lonhost) { |
|
my $actual = &Apache::lonnet::absolute_url($hostname); |
|
my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; |
|
unless ($actual eq $expected) { |
|
$env{'request.use_absolute'} = $expected; |
|
} |
|
} |
} |
} |
# -------------------------------------------------------- Load POST parameters |
# -------------------------------------------------------- Load POST parameters |
|
|