[BACK]Return to lonlogin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.162 and 1.166

version 1.162, 2015/03/06 20:39:22 version 1.166, 2016/04/19 18:09:11
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='';
 this.document.client.elements.upass$now.value='';  this.document.client.elements.upass$now.value='';
Line 395  ENDSCRIPT Line 388  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 413  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 468  ENDSCRIPT Line 472  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.162  
changed lines
  Added in v.1.166

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