[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.6 and 1.40.2.5.2.17

version 1.40.2.5.2.6, 2012/02/13 17:22:56 version 1.40.2.5.2.17, 2012/05/01 16:09:26
Line 57  sub handler { Line 57  sub handler {
   
     my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');      my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');
     my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');      my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');
     my $privkey = $r->subprocess_env->get('reCAPTCHA_PRIVATE');      my $privkey = $r->dir_config('reCAPTCHA_PRIVATE');
     my $pubkey  = $r->subprocess_env->get('reCAPTCHA_PUBLIC')      my $pubkey  = $r->dir_config('reCAPTCHA_PUBLIC');
   
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']);
     &Apache::lonacc::get_posted_cgi($r);      &Apache::lonacc::get_posted_cgi($r);
Line 102  sub handler { Line 102  sub handler {
     my ($js,$courseid,$title);      my ($js,$courseid,$title);
     if (defined($env{'form.courseid'})) {      if (defined($env{'form.courseid'})) {
         $courseid = &validate_course($env{'form.courseid'});          $courseid = &validate_course($env{'form.courseid'});
           if (($courseid eq 'relate_3H121116c19344ff3relatel1') ||
               ($courseid eq 'relate_3e100973b27484f2drelatel1')) {
               $courseid = 'relate_2764113e81b9e4f0crelatel1'; 
           }
     }      }
     if ($courseid ne '') {      if ($courseid ne '') {
         $js = &catreturn_js();          $js = &catreturn_js();
Line 409  sub print_username_form { Line 413  sub print_username_form {
         crea   => 'Create account with a username provided by this institution',          crea   => 'Create account with a username provided by this institution',
         crlc   => 'Create LON-CAPA account',          crlc   => 'Create LON-CAPA account',
         type   => 'Type in your log-in ID and password to find out.',          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.',          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.',          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.',          aftr   => 'After completing the activation process you will be directed to the course.',
         thes   => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012',          ther   => 'There you will have access to a "self test" that will help you assess your readiness for the course.',
           ywil   => 'You will also have access to introductory material and to the course schedule and policies.',
           yous   => 'Your user id for the course is your email address.',
     );      );
     my $output;      my $output;
     if (ref($cancreate) eq 'ARRAY') {      if (ref($cancreate) eq 'ARRAY') {
Line 430  sub print_username_form { Line 435  sub print_username_form {
         }          }
         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>'.
                         $lt{'sign'}.'<br />'.                          '<p class="LC_info">'.
                         $lt{'plse'}.'<br />'.                          &mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','<em>','</em>').'<br />'.
                         $lt{'inst'}.'<br />'.                          $lt{'plse'}.'</p><ul>'.
                         $lt{'aftr'}.'<br />'.                          '<li>'.$lt{'inst'}.'</li>'.
                         $lt{'thes'}.'<br />';                          '<li>'.$lt{'aftr'}.'<br />'.$lt{'ther'}.'<br />'.
                                  $lt{'ywil'}.'</li>'.
                           '<li>'.$lt{'yous'}.'</li></ul>';
             my $captchaform = &create_recaptcha($pubkey);              my $captchaform = &create_recaptcha($pubkey);
             if ($captchaform) {              if ($captchaform) {
                 my $submit_text = &mt('Sign-up');                  my $submit_text = &mt('Sign-up');
Line 611  sub call_rulecheck { Line 618  sub call_rulecheck {
 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 = '<h3>'.&mt('Account creation status').'</h3>'.      my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
               &mt('Thank you for your request to create a new LON-CAPA account.').                &mt('Thank you for your request to create a new Mechanics Online account.').
               '<br /><br />';                '<br /><br />';
     my $now = time;      my $now = time;
     my %info = ('ip'         => $ENV{'REMOTE_ADDR'},      my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
Line 622  sub send_token { Line 629  sub send_token {
     my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount');      my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount');
     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 $mailsubj = &mt('Your Mechanics Online Course Account');
         my $mailmsg = &mt('A request was submitted on [_1] for creation of a [_2] account.',$showtime,$domdesc)."\n".          my $msgfrom  = &mt('Mechanics Online Course Staff');
              &mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',          my $mailmsg =  &mt('Greetings.')."\n\n".
                  "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);                         &mt('Thank you for your interest in our Online Mechanics Course.').
         my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,                         ' '.
                                                  $contact_email);                         &mt('In order to complete the registration process, please open the following link in your web browser:').
                          "\n\n".
                          &Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token.
                          "\n\n".
                          &mt('This link will take you to a sign-up page where you will be asked to provide some general information and finalize the registration process.').
                          ' '.
                          &mt('A self-test (for review) is available within the course, for you to test your level of preparation.').
                          "\n\n".
                          &mt('Best Regards,').
                          "\n\n".
                          &mt('RELATE Group')."\n";
   
           my $result = &Apache::resetpw::send_mail('MIT',$email,$mailmsg,
                                                    $msgfrom,$contact_email,
                                                    $mailsubj);
         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 sign-up 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 sign-up process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
         } else {          } else {
Line 676  sub process_mailtoken { Line 697  sub process_mailtoken {
                     }                      }
                     my %form = &start_session($r,$data{'username'},$domain,                       my %form = &start_session($r,$data{'username'},$domain, 
                                               $lonhost,$data{'courseid'},                                                $lonhost,$data{'courseid'},
                                               $token);                                                $token,'new');
                     $nostart = 1;                      $nostart = 1;
                     $noend = 1;                      $noend = 1;
                 } else {                  } else {
Line 703  sub process_mailtoken { Line 724  sub process_mailtoken {
 }  }
   
 sub start_session {  sub start_session {
     my ($r,$username,$domain,$lonhost,$courseid,$token) = @_;      my ($r,$username,$domain,$lonhost,$courseid,$token,$usertype) = @_;
     my %form = (      my %form = (
                 uname => $username,                  uname => $username,
                 udom  => $domain,                  udom  => $domain,
Line 714  sub start_session { Line 735  sub start_session {
         if ($courseid ne '') {          if ($courseid ne '') {
             $form{'courseid'} = $courseid;              $form{'courseid'} = $courseid;
             $firsturl = '/adm/selfenroll?courseid='.$courseid;              $firsturl = '/adm/selfenroll?courseid='.$courseid;
               if ($usertype) {
                   $firsturl .= '&usertype='.$usertype;
               }
         }          }
     }      }
     if ($r->dir_config('lonBalancer') eq 'yes') {      if ($r->dir_config('lonBalancer') eq 'yes') {
Line 1123  sub username_activation { Line 1147  sub username_activation {
         if ($result eq 'ok') {          if ($result eq 'ok') {
             my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'});              my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'});
             $output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain);              $output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain);
             my %form = &start_session($r,$username,$domain,$lonhost,$courseid);              my %form = &start_session($r,$username,$domain,$lonhost,$courseid,undef,'new');
             my $nostart = 1;              my $nostart = 1;
             return ('ok',$output,$nostart);              return ('ok',$output,$nostart);
         } else {          } else {
Removed from v.1.40.2.5.2.6  
changed lines
  Added in v.1.40.2.5.2.17

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