version 1.158.2.1, 2015/03/06 22:32:39
|
version 1.158.2.4, 2015/06/06 14:40:28
|
Line 113 sub handler {
|
Line 113 sub handler {
|
my %sessiondata; |
my %sessiondata; |
if ($env{'form.iptoken'}) { |
if ($env{'form.iptoken'}) { |
%sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'}); |
%sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'}); |
my $delete = &Apache::lonnet::tmpdel($env{'form.token'}); |
unless ($sessiondata{'sessionserver'}) { |
|
my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'}); |
|
delete($env{'form.iptoken'}); |
|
} |
} |
} |
# ----------------------------------------------------------- Process Interface |
# ----------------------------------------------------------- Process Interface |
$env{'form.interface'}=~s/\W//g; |
$env{'form.interface'}=~s/\W//g; |
Line 126 sub handler {
|
Line 129 sub handler {
|
|
|
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
my $domain = &Apache::lonnet::default_login_domain(); |
my $domain = &Apache::lonnet::default_login_domain(); |
|
my $defdom = $domain; |
if ($lonhost ne '') { |
if ($lonhost ne '') { |
unless ($sessiondata{'sessionserver'}) { |
unless ($sessiondata{'sessionserver'}) { |
my $redirect = &check_loginvia($domain,$lonhost); |
my $redirect = &check_loginvia($domain,$lonhost); |
Line 222 sub handler {
|
Line 226 sub handler {
|
} |
} |
$tokenextras .= '&symb='.&escape($env{'form.symb'}); |
$tokenextras .= '&symb='.&escape($env{'form.symb'}); |
} |
} |
|
if ($env{'form.iptoken'}) { |
|
if (!$tokenextras) { |
|
$tokenextras = '&&'; |
|
} |
|
$tokenextras .= '&iptoken='.&escape($env{'form.iptoken'}); |
|
} |
my $logtoken=Apache::lonnet::reply( |
my $logtoken=Apache::lonnet::reply( |
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, |
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, |
$lonhost); |
$lonhost); |
Line 378 ENDSCRIPT
|
Line 388 ENDSCRIPT
|
alink => "$alink", |
alink => "$alink", |
onload => 'javascript:enableInput();',); |
onload => 'javascript:enableInput();',); |
|
|
my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom); |
my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf); |
my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost}; |
@hosts = &Apache::lonnet::current_machine_ids(); |
my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost}; |
$lonhost_in_use = $lonhost; |
|
if (@hosts > 1) { |
|
foreach my $hostid (@hosts) { |
|
if (&Apache::lonnet::host_domain($hostid) eq $defdom) { |
|
$lonhost_in_use = $hostid; |
|
last; |
|
} |
|
} |
|
} |
|
%defaultdomconf = &Apache::loncommon::get_domainconf($defdom); |
|
$headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use}; |
|
$headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use}; |
if ($headextra) { |
if ($headextra) { |
my $omitextra; |
my $omitextra; |
if ($headextra_exempt ne '') { |
if ($headextra_exempt ne '') { |
Line 392 ENDSCRIPT
|
Line 413 ENDSCRIPT
|
} |
} |
unless ($omitextra) { |
unless ($omitextra) { |
my $confname = $defdom.'-domainconfig'; |
my $confname = $defdom.'-domainconfig'; |
if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost/\E}) { |
if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) { |
my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra)); |
my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra)); |
unless ($extra eq '-1') { |
unless ($extra eq '-1') { |
$js .= "\n".$extra."\n"; |
$js .= "\n".$extra."\n"; |