version 1.188, 2021/10/06 19:28:55
|
version 1.191, 2021/10/10 23:22:30
|
Line 62 sub handler {
|
Line 62 sub handler {
|
(!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) {
|
(!$env{'form.ltoken'}) && (!$env{'form.linkkey'})) {
|
&Apache::lonacc::get_posted_cgi($r,['linkkey']);
|
&Apache::lonacc::get_posted_cgi($r,['linkkey']);
|
}
|
}
|
|
if ($env{'form.firsturl'} eq '/adm/logout') {
|
|
delete($env{'form.firsturl'});
|
|
}
|
|
|
# -- check if they are a migrating user
|
# -- check if they are a migrating user
|
if (defined($env{'form.token'})) {
|
if (defined($env{'form.token'})) {
|
Line 414 sub handler {
|
Line 417 sub handler {
|
}
|
}
|
if ($env{'form.ltoken'}) {
|
if ($env{'form.ltoken'}) {
|
my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
|
my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
|
&Apache::lonnet::tmpdel($env{'form.ltoken'});
|
|
delete($env{'form.ltoken'});
|
|
if ($info{'linkprot'}) {
|
if ($info{'linkprot'}) {
|
if (!$tokenextras) {
|
if (!$tokenextras) {
|
$tokenextras = '&&&';
|
$tokenextras = '&&&';
|
Line 439 sub handler {
|
Line 440 sub handler {
|
if ($logtoken eq 'no_such_host') {
|
if ($logtoken eq 'no_such_host') {
|
&Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
|
&Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
|
}
|
}
|
|
if ($env{'form.ltoken'}) {
|
|
&Apache::lonnet::tmpdel($env{'form.ltoken'});
|
|
delete($env{'form.ltoken'});
|
|
}
|
my $spares='';
|
my $spares='';
|
my (@sparehosts,%spareservers);
|
my (@sparehosts,%spareservers);
|
my $sparesref = &Apache::lonnet::this_host_spares($defdom);
|
my $sparesref = &Apache::lonnet::this_host_spares($defdom);
|
Line 807 HEADER
|
Line 812 HEADER
|
$ssologin = $samlssourl;
|
$ssologin = $samlssourl;
|
}
|
}
|
if ($env{'form.firsturl'} ne '') {
|
if ($env{'form.firsturl'} ne '') {
|
my $querystring;
|
my $querystring = 'origurl=';
|
if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
|
if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
|
$querystring = &uri_escape_utf8($env{'form.firsturl'});
|
$querystring .= &uri_escape_utf8($env{'form.firsturl'});
|
} else {
|
} else {
|
$querystring = &uri_escape($env{'form.firsturl'});
|
$querystring .= &uri_escape($env{'form.firsturl'});
|
}
|
}
|
$querystring = &HTML::Entities::encode($querystring,"'");
|
$querystring = &HTML::Entities::encode($querystring,"'");
|
$ssologin .= (($ssologin=~/\?/)?'&':'?') . $querystring;
|
$ssologin .= (($ssologin=~/\?/)?'&':'?') . $querystring;
|
}
|
}
|
|
if ($env{'form.ltoken'} ne '') {
|
|
$querystring .= (($querystring eq '')?'':'&') . 'ltoken='.
|
|
&HTML::Entities::encode(&uri_escape($env{'form.ltoken'}));
|
|
} elsif ($env{'form.linkkey'}) {
|
|
$querystring .= (($querystring eq '')?'':'&') . 'linkkey='.
|
|
&HTML::Entities::encode(&uri_escape($env{'form.linkkey'}));
|
|
}
|
my $ssohref;
|
my $ssohref;
|
if ($samlssoimg ne '') {
|
if ($samlssoimg ne '') {
|
$ssohref = '<a href="'.$ssologin.'" title="'.$samltooltip.'"><img src="'.$samlssoimg.'" alt="'.$samlssoalt.'" /></a>';
|
$ssohref = '<a href="'.$ssologin.'" title="'.$samltooltip.'"><img src="'.$samlssoimg.'" alt="'.$samlssoalt.'" /></a>';
|
Line 846 $coursecatalog
|
Line 858 $coursecatalog
|
</div>
|
</div>
|
</div>
|
</div>
|
ENDSAML
|
ENDSAML
|
|
} else {
|
|
if ($env{'form.ltoken'}) {
|
|
&Apache::lonnet::tmpdel($env{'form.ltoken'});
|
|
delete($env{'form.ltoken'});
|
|
}
|
}
|
}
|
|
|
$r->print(<<ENDLOGIN);
|
$r->print(<<ENDLOGIN);
|