Diff for /loncom/auth/lonlogin.pm between versions 1.163 and 1.167

version 1.163, 2015/06/06 14:08:58 version 1.167, 2016/05/03 22:27:14
Line 352  uextkey=this.document.client.elements.ue Line 352  uextkey=this.document.client.elements.ue
 lextkey=this.document.client.elements.lextkey.value;  lextkey=this.document.client.elements.lextkey.value;
 initkeys();  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:'){  if(this.document.server.action.substr(0,5) === 'http:'){
     for (var idx in [1,2,3]){      this.document.server.elements.upass0.value
         this.document.server.elements['upass' + idx].value =          =getCrypted(this.document.client.elements.upass$now.value);
             crypted(this.document.server.elements['upass' + idx].value);  } else {
     }      this.document.server.elements.upass0.value
           =this.document.client.elements.upass$now.value;
 }  }
   
 this.document.client.elements.uname.value='';  this.document.client.elements.uname.value='';
Line 395  ENDSCRIPT Line 389  ENDSCRIPT
        alink        => "$alink",         alink        => "$alink",
                onload       => 'javascript:enableInput();',);                 onload       => 'javascript:enableInput();',);
   
     my ($lonhost_in_use,$headextra);      my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
     my @hosts = &Apache::lonnet::current_machine_ids();      @hosts = &Apache::lonnet::current_machine_ids();
     my $lonhost_in_use = $lonhost;      $lonhost_in_use = $lonhost;
     if (@hosts > 1) {      if (@hosts > 1) {
         foreach my $hostid (@hosts) {          foreach my $hostid (@hosts) {
             if (&Apache::lonnet::host_domain($hostid) eq $defdom) {              if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
Line 406  ENDSCRIPT Line 400  ENDSCRIPT
             }              }
         }          }
     }      }
     my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);      %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
     my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};      $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
     my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$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 479  ENDSCRIPT Line 473  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'}" />

Removed from v.1.163  
changed lines
  Added in v.1.167


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>