[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.15

version 1.11, 2008/07/08 13:57:00 version 1.15, 2008/07/10 00:18:05
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 64  sub handler { Line 65  sub handler {
     }      }
     my $domdesc = &Apache::lonnet::domain($domain,'description');      my $domdesc = &Apache::lonnet::domain($domain,'description');
     my $contact_name = &mt('LON-CAPA helpdesk');      my $contact_name = &mt('LON-CAPA helpdesk');
     my $contact_email =  $r->dir_config('lonSupportEMail');      my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
       my $contacts =
           &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                    $domain,$origmail);
       my ($contact_email) = split(',',$contacts);
     my $lonhost = $r->dir_config('lonHostID');      my $lonhost = $r->dir_config('lonHostID');
     my $include = $r->dir_config('lonIncludes');      my $include = $r->dir_config('lonIncludes');
     my $start_page;      my $start_page;
Line 107  sub handler { Line 112  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 122  sub handler { Line 129  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.');                  $msg .= '<h4>'.&mt('Account creation unavailable');'</h4>';
             } elsif ($checkfail eq 'authtoken') {                  if ($checkfail eq 'username') {
                 $msg .= &mt('Error creating token.');                      $msg .= '<span class="LC_warning">'.
                               &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($msg.'<br />'.$output);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
     }      }
Line 195  sub handler { Line 210  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 295  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 366  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".
Line 431  sub process_email_request { Line 470  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 450  sub send_token { Line 491  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 864  sub check_id { Line 907  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 878  sub invalid_state { Line 921  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;
     }      }
Line 914  sub create_captcha { Line 958  sub create_captcha {
   
 sub captcha_settings {  sub captcha_settings {
     my %captcha_params = (       my %captcha_params = ( 
                            output_dir     => $Apache::lonnet::perlvar{'lonDocRoot'}.'/captcha',                             output_dir     => $Apache::lonnet::perlvar{'lonCaptchaDir'},
                            www_output_dir => "/captcha",                             www_output_dir => "/captchaspool",
                            db_dir         => "/home/www/captchadb",                             db_dir         => $Apache::lonnet::perlvar{'lonCaptchaDb'},
                            numchars       => '5',                             numchars       => '5',
                          );                           );
     return %captcha_params;      return %captcha_params;
Removed from v.1.11  
changed lines
  Added in v.1.15

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