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

Diff for /loncom/interface/createaccount.pm between versions 1.11 and 1.12

version 1.11, 2008/07/08 13:57:00 version 1.12, 2008/07/08 17:47:57
Line 35  use Apache::Constants qw(:common); Line 35  use Apache::Constants qw(:common);
 use Apache::lonacc;  use Apache::lonacc;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
   use Apache::lonhtmlcommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonauth;  use Apache::lonauth;
 use Apache::resetpw;  use Apache::resetpw;
Line 195  sub handler { Line 196  sub handler {
             $r->print(<$jsh>);              $r->print(<$jsh>);
             $r->print(&javascript_setforms($now));              $r->print(&javascript_setforms($now));
         }          }
           if (grep(/^email$/,@cancreate)) {
               $r->print(&javascript_validmail());
           }
         $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,          $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
                                        $courseid);                                          $courseid); 
     }      }
Line 277  ENDSCRIPT Line 281  ENDSCRIPT
     return $js;      return $js;
 }  }
   
   sub javascript_validmail {
       my %lt = &Apache::lonlocal::texthash (
                  email => 'The e-mail address you entered',
                  notv  => 'is not a valid e-mail address',
       );
       my $output =  "\n".'<script type="text/javascript">'."\n".
                     &Apache::lonhtmlcommon::javascript_valid_email()."\n";
       $output .= <<"ENDSCRIPT";
   function validate_email() {
       field = document.createaccount.useremail;
       if (validmail(field) == false) {
           alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
           return false;
       }
       return true;
   }
   ENDSCRIPT
       $output .= "\n".'</script>'."\n";
       return $output;
   }
   
 sub print_username_form {  sub print_username_form {
     my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;      my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
Line 327  sub print_username_form { Line 352  sub print_username_form {
             my $emailform = '<input type="text" name="useremail" size="25" value="" />';              my $emailform = '<input type="text" name="useremail" size="25" value="" />';
             my $captchaform = &create_captcha();              my $captchaform = &create_captcha();
             my $submit_text = &mt('Request LON-CAPA account');              my $submit_text = &mt('Request LON-CAPA account');
             $output .=  '<form name="createaccount" method="post" onsubmit="validate_email();" action="/adm/createaccount">'.              $output .=  '<form name="createaccount" method="post" onSubmit="return validate_email()" action="/adm/createaccount">'.
                         &Apache::lonhtmlcommon::start_pick_box()."\n".                          &Apache::lonhtmlcommon::start_pick_box()."\n".
                         &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),                          &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),
                                                          'LC_pick_box_title')."\n".                                                           'LC_pick_box_title')."\n".
Removed from v.1.11  
changed lines
  Added in v.1.12

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