Diff for /loncom/interface/createaccount.pm between versions 1.68 and 1.71

version 1.68, 2014/06/19 23:36:54 version 1.71, 2016/02/17 19:15:48
Line 389  sub javascript_setforms { Line 389  sub javascript_setforms {
     }      }
     if (@required) {      if (@required) {
         my $missprompt = &mt('One or more required fields are currently blank.');          my $missprompt = &mt('One or more required fields are currently blank.');
           &js_escape(\$missprompt);
         my $reqstr = join("','",@required);          my $reqstr = join("','",@required);
         $requiredchk = <<"ENDCHK";          $requiredchk = <<"ENDCHK";
                 var requiredfields = new Array('$reqstr');                  var requiredfields = new Array('$reqstr');
Line 430  $requiredchk Line 431  $requiredchk
                 initkeys();                  initkeys();
   
                 server.elements.upass.value                  server.elements.upass.value
                     = crypted(client.elements.upass$now.value);                      = getCrypted(client.elements.upass$now.value);
   
                 client.elements.uname.value='';                  client.elements.uname.value='';
                 client.elements.upass$now.value='';                  client.elements.upass$now.value='';
Line 443  $setuserinfo Line 444  $setuserinfo
         }          }
         return false;          return false;
     }      }
   
 // ]]>  // ]]>
 </script>  </script>
 ENDSCRIPT  ENDSCRIPT
Line 452  ENDSCRIPT Line 454  ENDSCRIPT
 sub javascript_checkpass {  sub javascript_checkpass {
     my ($now,$context) = @_;      my ($now,$context) = @_;
     my $nopass = &mt('You must enter a password.');      my $nopass = &mt('You must enter a password.');
     my $mismatchpass = &mt('The passwords you entered did not match.').'\\n'.      my $mismatchpass = &mt('The passwords you entered did not match.')."\n".
                        &mt('Please try again.');                          &mt('Please try again.'); 
       &js_escape(\$nopass);
       &js_escape(\$mismatchpass);
     my $js = <<"ENDSCRIPT";      my $js = <<"ENDSCRIPT";
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
Line 487  ENDSCRIPT Line 491  ENDSCRIPT
 }  }
   
 sub javascript_validmail {  sub javascript_validmail {
     my %lt = &Apache::lonlocal::texthash (      my %js_lt = &Apache::lonlocal::texthash (
                email => 'The e-mail address you entered',                 email => 'The e-mail address you entered',
                notv  => 'is not a valid e-mail address',                 notv  => 'is not a valid e-mail address',
     );      );
     my $output =  "\n".'<script type="text/javascript">'."\n".      my $output =  "\n".'<script type="text/javascript">'."\n".
                   '// <![CDATA['."\n".                    '// <![CDATA['."\n".
                   &Apache::lonhtmlcommon::javascript_valid_email()."\n";                    &Apache::lonhtmlcommon::javascript_valid_email()."\n";
       &js_escape(\%js_lt);
     $output .= <<"ENDSCRIPT";      $output .= <<"ENDSCRIPT";
 function validate_email(client) {  function validate_email(client) {
     field = client.uname;      field = client.uname;
     if (validmail(field) == false) {      if (validmail(field) == false) {
         alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");          alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
         return false;          return false;
     }      }
     return true;      return true;
Line 856  sub process_mailtoken { Line 861  sub process_mailtoken {
   
 sub start_session {  sub start_session {
     my ($r,$username,$domain,$uhome,$courseid,$token) = @_;      my ($r,$username,$domain,$uhome,$courseid,$token) = @_;
       my ($is_balancer) = &Apache::lonnet::check_loadbalancing($username,$domain);
     if ($r->dir_config('lonBalancer') eq 'yes') {      if ($is_balancer) {
         Apache::lonauth::success($r, $username, $domain, $uhome,          Apache::lonauth::success($r, $username, $domain, $uhome,
             'noredirect', undef, {});              'noredirect', undef, {});
   
Line 871  sub start_session { Line 876  sub start_session {
             ($courseid ? "/adm/selfenroll?courseid=$courseid" : '/adm/roles'),              ($courseid ? "/adm/selfenroll?courseid=$courseid" : '/adm/roles'),
             undef, {});               undef, {}); 
     }      }
   
     return;      return;
 }  }
   

Removed from v.1.68  
changed lines
  Added in v.1.71


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