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

Diff for /loncom/interface/createaccount.pm between versions 1.13 and 1.14

version 1.13, 2008/07/08 17:52:16 version 1.14, 2008/07/09 17:30:59
Line 108  sub handler { Line 108  sub handler {
   
     if (@cancreate == 0) {      if (@cancreate == 0) {
         &print_header($r,$start_page);          &print_header($r,$start_page);
         my $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);          my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                        '<span class="LC_warning">'.
                        &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc).'</span><br /><br />';
         $r->print($output);          $r->print($output);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
Line 123  sub handler { Line 125  sub handler {
         &print_header($r,$start_page);          &print_header($r,$start_page);
         my ($output,$msg);          my ($output,$msg);
         if (grep(/^sso$/,@cancreate)) {          if (grep(/^sso$/,@cancreate)) {
             $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain.");              $msg = '<h3>'.&mt('Account creation').'</h3>'.
                      &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain.").'<br /><br />';
             ($output, my $checkfail) = &username_check($sso_username,$domain,              ($output, my $checkfail) = &username_check($sso_username,$domain,
                                                        $domdesc,$courseid,                                                         $domdesc,$courseid,
                                                        $lonhost,$contact_email);                                                          $lonhost,$contact_email);
             if ($checkfail eq 'username') {              if ($checkfail) {
                 $msg .= &mt('A LON-CAPA account may not be created with the username you use.');                  if ($checkfail eq 'username') {
             } elsif ($checkfail eq 'authtoken') {                      $msg .= '<span class="LC_warning">'.
                 $msg .= &mt('Error creating token.');                              &mt('A LON-CAPA account may not be created with the username you use.').'</span>';
                   } elsif ($checkfail eq 'authtoken') {
                       $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>';
                   }
                   $msg .= '<br /><br />'.
                           &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
             } else {              } else {
                 $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');                  $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
             }              }
         } else {          } else {
             $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.");              $msg .= '<h3>'.&mt('Account creation unavailable').'</h3>'.
                       '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
         }          }
         $r->print('<h4>'.$msg.'</h4>'.$output);          $r->print('<h4>'.$msg.'</h4>'.$output);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
Line 456  sub process_email_request { Line 465  sub process_email_request {
   
 sub send_token {  sub send_token {
     my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;      my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
     my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'<br /><br />';      my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
                 &mt('Thank you for your request to create a new LON-CAPA account.').
                 '<br /><br />';
     my $now = time;      my $now = time;
     my %info = ('ip'         => $ENV{'REMOTE_ADDR'},      my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                 'time'       => $now,                  'time'       => $now,
Line 475  sub send_token { Line 486  sub send_token {
         if ($result eq 'ok') {          if ($result eq 'ok') {
             $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');              $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
         } else {          } else {
             $msg .= &mt('An error occurred when sending a message to the e-mail address you provided.')              $msg .= '<span class="LC_error">'.
                    .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);                      &mt('An error occurred when sending a message to the e-mail address you provided.').'</span><br />'.
                       ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
         }          }
     } else {      } else {
         $msg .= &mt('An error occurred creating a token required for the account creation process.')          $msg .= '<span class="LC_error">'.
                .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);                  &mt('An error occurred creating a token required for the account creation process.').'</span><br />'.
                   ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
     }      }
     return $msg;      return $msg;
 }  }
Line 889  sub check_id { Line 902  sub check_id {
   
 sub invalid_state {  sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;      my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
     my $msg;      my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">';
     if ($error eq 'baduseremail') {      if ($error eq 'baduseremail') {
         $msg = &mt('The e-mail address you provided does not appear to be a valid address.');          $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
     } elsif ($error eq 'existinguser') {      } elsif ($error eq 'existinguser') {
Line 903  sub invalid_state { Line 916  sub invalid_state {
     } elsif ($error eq 'noemails') {      } elsif ($error eq 'noemails') {
         $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted in this LON-CAPA domain.');          $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted in this LON-CAPA domain.');
     }      }
       $msg .= '</span>';
     if ($msgtext) {      if ($msgtext) {
         $msg .= '<br />'.$msgtext;          $msg .= '<br />'.$msgtext;
     }      }
Removed from v.1.13  
changed lines
  Added in v.1.14

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