--- loncom/auth/lonlogin.pm 2015/03/06 20:39:22 1.162
+++ loncom/auth/lonlogin.pm 2016/02/17 19:15:39 1.165
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.162 2015/03/06 20:39:22 raeburn Exp $
+# $Id: lonlogin.pm,v 1.165 2016/02/17 19:15:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -352,18 +352,9 @@ uextkey=this.document.client.elements.ue
lextkey=this.document.client.elements.lextkey.value;
initkeys();
-this.document.server.elements.upass0.value
- =this.document.client.elements.upass$now.value.substr(0,15);
-this.document.server.elements.upass1.value
- =this.document.client.elements.upass$now.value.substr(15,15);
-this.document.server.elements.upass2.value
- =this.document.client.elements.upass$now.value.substr(30,15);
-
if(this.document.server.action.substr(0,5) === 'http:'){
- for (var idx in [1,2,3]){
- this.document.server.elements['upass' + idx].value =
- crypted(this.document.server.elements['upass' + idx].value);
- }
+ this.document.server.elements.upass0.value
+ =getCrypted(this.document.client.elements.upass$now.value);
}
this.document.client.elements.uname.value='';
@@ -395,9 +386,20 @@ ENDSCRIPT
alink => "$alink",
onload => 'javascript:enableInput();',);
- my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
- my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost};
- my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost};
+ 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 '') {
@@ -409,7 +411,7 @@ ENDSCRIPT
}
unless ($omitextra) {
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));
unless ($extra eq '-1') {
$js .= "\n".$extra."\n";
@@ -468,8 +470,6 @@ ENDSCRIPT
-
-