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

version 1.40.2.5.2.10, 2012/02/14 16:15:30 version 1.40.2.5.2.17, 2012/05/01 16:09:26
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 411  sub print_username_form { Line 415  sub print_username_form {
         type   => 'Type in your log-in ID and password to find out.',          type   => 'Type in your log-in ID and password to find out.',
         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 433  sub print_username_form { Line 439  sub print_username_form {
                         &mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','<em>','</em>').'<br />'.                          &mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','<em>','</em>').'<br />'.
                         $lt{'plse'}.'</p><ul>'.                          $lt{'plse'}.'</p><ul>'.
                         '<li>'.$lt{'inst'}.'</li>'.                          '<li>'.$lt{'inst'}.'</li>'.
                         '<li>'.$lt{'aftr'}.'</li>'.                          '<li>'.$lt{'aftr'}.'<br />'.$lt{'ther'}.'<br />'.
                         '<li>'.$lt{'thes'}.'</li></ul>';                                 $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 633  sub send_token { Line 640  sub send_token {
                        "\n\n".                         "\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('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('The course will begin on March 1st, and until that date, a self-test will be available for you to test your level of preparation for our course.').                         &mt('A self-test (for review) is available within the course, for you to test your level of preparation.').
                        ' '.  
                        &mt('The self-test is an integral part of the course, and should be completed by the March 1st start date.').  
                        "\n\n".                         "\n\n".
                        &mt('Best Regards,').                         &mt('Best Regards,').
                        "\n\n".                         "\n\n".
Line 692  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 719  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 730  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 1139  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.10  
changed lines
  Added in v.1.40.2.5.2.17

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