--- loncom/interface/createaccount.pm 2012/02/14 01:06:12 1.40.2.5.2.8 +++ loncom/interface/createaccount.pm 2012/05/01 16:09:26 1.40.2.5.2.17 @@ -3,7 +3,7 @@ # institutional log-in ID (institutional authentication required - localauth # or kerberos) or an e-mail address. # -# $Id: createaccount.pm,v 1.40.2.5.2.8 2012/02/14 01:06:12 raeburn Exp $ +# $Id: createaccount.pm,v 1.40.2.5.2.17 2012/05/01 16:09:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -102,6 +102,10 @@ sub handler { my ($js,$courseid,$title); if (defined($env{'form.courseid'})) { $courseid = &validate_course($env{'form.courseid'}); + if (($courseid eq 'relate_3H121116c19344ff3relatel1') || + ($courseid eq 'relate_3e100973b27484f2drelatel1')) { + $courseid = 'relate_2764113e81b9e4f0crelatel1'; + } } if ($courseid ne '') { $js = &catreturn_js(); @@ -411,8 +415,10 @@ sub print_username_form { type => 'Type in your log-in ID and password to find out.', 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.', + aftr => 'After completing the activation process you will be directed to the course.', + 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; if (ref($cancreate) eq 'ARRAY') { @@ -433,8 +439,9 @@ sub print_username_form { &mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','','').'
'. $lt{'plse'}.'

'; + '
  • '.$lt{'aftr'}.'
    '.$lt{'ther'}.'
    '. + $lt{'ywil'}.'
    • '. + '
  • '.$lt{'yous'}.'
    • '; my $captchaform = &create_recaptcha($pubkey); if ($captchaform) { my $submit_text = &mt('Sign-up'); @@ -611,7 +618,7 @@ sub call_rulecheck { sub send_token { my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_; my $msg = '

    '.&mt('Account creation status').'

    '. - &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.'). '

    '; my $now = time; my %info = ('ip' => $ENV{'REMOTE_ADDR'}, @@ -622,12 +629,26 @@ sub send_token { my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount'); if ($token !~ /^error/ && $token ne 'no_such_host') { my $esc_token = &escape($token); - my $showtime = localtime(time); - 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]', - "\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token); - my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, - $contact_email); + my $mailsubj = &mt('Your Mechanics Online Course Account'); + my $msgfrom = &mt('Mechanics Online Course Staff'); + my $mailmsg = &mt('Greetings.')."\n\n". + &mt('Thank you for your interest in our Online Mechanics Course.'). + ' '. + &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') { $msg .= &mt('A message has been sent to the e-mail address you provided.').'
    '.&mt('The message includes the web address for the link you will use to complete the sign-up process.').'
    '.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'',''); } else { @@ -676,7 +697,7 @@ sub process_mailtoken { } my %form = &start_session($r,$data{'username'},$domain, $lonhost,$data{'courseid'}, - $token); + $token,'new'); $nostart = 1; $noend = 1; } else { @@ -703,7 +724,7 @@ sub process_mailtoken { } sub start_session { - my ($r,$username,$domain,$lonhost,$courseid,$token) = @_; + my ($r,$username,$domain,$lonhost,$courseid,$token,$usertype) = @_; my %form = ( uname => $username, udom => $domain, @@ -714,6 +735,9 @@ sub start_session { if ($courseid ne '') { $form{'courseid'} = $courseid; $firsturl = '/adm/selfenroll?courseid='.$courseid; + if ($usertype) { + $firsturl .= '&usertype='.$usertype; + } } } if ($r->dir_config('lonBalancer') eq 'yes') { @@ -1123,7 +1147,7 @@ sub username_activation { if ($result eq 'ok') { 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); - my %form = &start_session($r,$username,$domain,$lonhost,$courseid); + my %form = &start_session($r,$username,$domain,$lonhost,$courseid,undef,'new'); my $nostart = 1; return ('ok',$output,$nostart); } else {