version 1.162, 2015/03/06 20:39:22
|
version 1.164, 2015/06/06 14:39:42
|
Line 395 ENDSCRIPT
|
Line 395 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 409 ENDSCRIPT
|
Line 420 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";
|