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

Diff for /loncom/interface/createaccount.pm between versions 1.40.2.5.2.4 and 1.40.2.5.2.5

version 1.40.2.5.2.4, 2012/02/12 19:59:31 version 1.40.2.5.2.5, 2012/02/13 05:24:22
Line 399  ENDSCRIPT Line 399  ENDSCRIPT
   
 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 (
                                          unam => 'username',          unam   => 'username',
                                          udom => 'domain',          udom   => 'domain',
                                          uemail => 'E-mail address in LON-CAPA',          uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');          proc   => 'Proceed',
           crea   => 'Create account with a username provided by this institution',
           crlc   => 'Create LON-CAPA account',
           type   => 'Type in your log-in ID and password to find out.',
           sign   => 'You are about to sign-up for the Mechanics Online course.',
           plse   => 'Please enter a valid e-mail address below.',
           inst   => 'Instructions on how to activate your account will be sent to the e-mail address you provide.',
           aftr   => 'After completing the activation process you will have access to a "self test" that will help you assess your readiness for the course.',
           thes   => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012',
       );
     my $output;      my $output;
     if (ref($cancreate) eq 'ARRAY') {      if (ref($cancreate) eq 'ARRAY') {
         if (grep(/^login$/,@{$cancreate})) {          if (grep(/^login$/,@{$cancreate})) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);              my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
             if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {              if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
                 $output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by this institution').'</h3>';                  $output = '<div class="LC_left_float"><h3>'.$lt{'crea'}.'</h3>';
                 my $submit_text = &mt('Create LON-CAPA account');                  my $submit_text = $lt{'crlc'};
                 $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';                  $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />').
                              '<br /><br />'.$lt{'type'}.'<br /><br />';
                 $output .= &login_box($now,$lonhost,$courseid,$submit_text,                  $output .= &login_box($now,$lonhost,$courseid,$submit_text,
                                       $domain,'createaccount').'</div>';                                        $domain,'createaccount').'</div>';
             }              }
         }          }
         if (grep(/^email$/,@{$cancreate})) {          if (grep(/^email$/,@{$cancreate})) {
             $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'.              $output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>'.
                         &mt('You are about to sign-up for a Mechanics Online account so you can take the pre-requisite test for enrollment in the online course.').'<br />'.                          $lt{'sign'}.'<br />'.
                         &mt('Your performance on the test will help both you and us gauge your readiness to take the course.').'<br />'.                          $lt{'plse'}.'<br />'.
                         &mt('Although the pre-test exam will be the basis for admitting people into the course, we can only accommodate a limited number of students.').'<br />'.                          $lt{'inst'}.'<br />'.
                         &mt('We will e-mail you with instructions on how to access the course by the end of February, if we are able to accommodate you.').'<br />';                          $lt{'aftr'}.'<br />'.
                           $lt{'thes'}.'<br />';
             my $captchaform = &create_recaptcha();              my $captchaform = &create_recaptcha();
             if ($captchaform) {              if ($captchaform) {
                 my $submit_text = &mt('Sign-up');                  my $submit_text = &mt('Sign-up');
                 my $emailform = '<input type="text" name="useremail" size="25" value="" />';                  my $emailform = '<input type="text" name="useremail" size="25" value="" />';
                 if (grep(/^login$/,@{$cancreate})) {                  if (grep(/^login$/,@{$cancreate})) {
                     $output .= &mt('Provide your e-mail address to sign up for a Mechanics Online account if you do not have a log-in ID at your institution.','<br />').'<br /><br />';                      $output .= &mt('Provide your e-mail address to sign up for a Mechanics Online account [_1]if you do not have a log-in ID at your institution.','<br />').'<br /><br />';
                 } else {                  } else {
                     $output .= '<br />';                      $output .= '<br />';
                 }                  }
Line 610  sub send_token { Line 621  sub send_token {
     if ($token !~ /^error/ && $token ne 'no_such_host') {      if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);          my $esc_token = &escape($token);
         my $showtime = localtime(time);          my $showtime = localtime(time);
         my $mailmsg = &mt('A request was submitted on [_1] for creation of a [_1] account.',$showtime,$domdesc)."\n".          my $mailmsg = &mt('A request was submitted on [_1] for creation of a [_2] account.',$showtime,$domdesc)."\n".
              &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',               &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',
                  "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);                   "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
         my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,          my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
Removed from v.1.40.2.5.2.4  
changed lines
  Added in v.1.40.2.5.2.5

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