version 1.158.2.2, 2015/03/06 22:36:56
|
version 1.158.2.6, 2016/08/13 20:11:58
|
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 352 lextkey=this.document.client.elements.le
|
Line 353 lextkey=this.document.client.elements.le
|
initkeys(); |
initkeys(); |
|
|
this.document.server.elements.upass0.value |
this.document.server.elements.upass0.value |
=crypted(this.document.client.elements.upass$now.value.substr(0,15)); |
=getCrypted(this.document.client.elements.upass$now.value); |
this.document.server.elements.upass1.value |
|
=crypted(this.document.client.elements.upass$now.value.substr(15,15)); |
|
this.document.server.elements.upass2.value |
|
=crypted(this.document.client.elements.upass$now.value.substr(30,15)); |
|
|
|
this.document.client.elements.uname.value=''; |
this.document.client.elements.uname.value=''; |
this.document.client.elements.upass$now.value=''; |
this.document.client.elements.upass$now.value=''; |
Line 387 ENDSCRIPT
|
Line 384 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 401 ENDSCRIPT
|
Line 409 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"; |
Line 460 ENDSCRIPT
|
Line 468 ENDSCRIPT
|
<input type="hidden" name="serverid" value="$lonhost" /> |
<input type="hidden" name="serverid" value="$lonhost" /> |
<input type="hidden" name="uname" value="" /> |
<input type="hidden" name="uname" value="" /> |
<input type="hidden" name="upass0" value="" /> |
<input type="hidden" name="upass0" value="" /> |
<input type="hidden" name="upass1" value="" /> |
|
<input type="hidden" name="upass2" value="" /> |
|
<input type="hidden" name="udom" value="" /> |
<input type="hidden" name="udom" value="" /> |
<input type="hidden" name="localpath" value="$env{'form.localpath'}" /> |
<input type="hidden" name="localpath" value="$env{'form.localpath'}" /> |
<input type="hidden" name="localres" value="$env{'form.localres'}" /> |
<input type="hidden" name="localres" value="$env{'form.localres'}" /> |
Line 512 LFORM
|
Line 518 LFORM
|
$r->print(<<HEADER); |
$r->print(<<HEADER); |
<!-- The LON-CAPA Header --> |
<!-- The LON-CAPA Header --> |
<div style="background:$pgbg;margin:0;width:100%;"> |
<div style="background:$pgbg;margin:0;width:100%;"> |
<img src="$img" border="0" alt="The Learning Online Network with CAPA" /> |
<img src="$img" border="0" alt="The Learning Online Network with CAPA" class="LC_maxwidth" /> |
</div> |
</div> |
HEADER |
HEADER |
} |
} |
Line 536 HEADER
|
Line 542 HEADER
|
<div> |
<div> |
ENDTOP |
ENDTOP |
if ($showmainlogo) { |
if ($showmainlogo) { |
$r->print(' <img src="'.$logo.'" alt="" />'."\n"); |
$r->print(' <img src="'.$logo.'" alt="" class="LC_maxwidth" />'."\n"); |
} |
} |
$r->print(<<ENDTOP); |
$r->print(<<ENDTOP); |
$announcements |
$announcements |