version 1.158.2.4, 2015/06/06 14:40:28
|
version 1.159, 2014/10/04 02:59:32
|
Line 129 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 388 ENDSCRIPT
|
Line 387 ENDSCRIPT
|
alink => "$alink", |
alink => "$alink", |
onload => 'javascript:enableInput();',); |
onload => 'javascript:enableInput();',); |
|
|
my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf); |
|
@hosts = &Apache::lonnet::current_machine_ids(); |
|
$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) { |
|
my $omitextra; |
|
if ($headextra_exempt ne '') { |
|
my @exempt = split(',',$headextra_exempt); |
|
my $ip = $ENV{'REMOTE_ADDR'}; |
|
if (grep(/^\Q$ip\E$/,@exempt)) { |
|
$omitextra = 1; |
|
} |
|
} |
|
unless ($omitextra) { |
|
my $confname = $defdom.'-domainconfig'; |
|
if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) { |
|
my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra)); |
|
unless ($extra eq '-1') { |
|
$js .= "\n".$extra."\n"; |
|
} |
|
} |
|
} |
|
} |
|
|
|
$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, |
$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, |
{ 'redirect' => [$expire,'/adm/roles'], |
{ 'redirect' => [$expire,'/adm/roles'], |
'add_entries' => \%add_entries, |
'add_entries' => \%add_entries, |