--- loncom/interface/createaccount.pm 2012/02/06 02:36:29 1.40.2.5.2.1 +++ loncom/interface/createaccount.pm 2012/02/11 23:30:16 1.40.2.5.2.3 @@ -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.1 2012/02/06 02:36:29 raeburn Exp $ +# $Id: createaccount.pm,v 1.40.2.5.2.3 2012/02/11 23:30:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -417,13 +417,17 @@ sub print_username_form { } } if (grep(/^email$/,@{$cancreate})) { - $output .= '

'.&mt('Create account with an e-mail address as your username').'

'; + $output .= '

'.&mt('Create account with an e-mail address as your username').'

'. + &mt('You are about to sign-up for a Learn Physics account so you can take the pre-requisite test for enrollment in the online course.').'
'. + &mt('Your performance on the test will help both you and us gauge your readiness to take the course.').'
'. + &mt('Although the pre-test exam will be the basis for admitting people into the course, we can only accommodate a limited number of students.').'
'. + &mt('We will e-mail you with instructions on how to access the course by the end of February, if we are able to accommodate you.').'
'; my $captchaform = &create_recaptcha(); if ($captchaform) { - my $submit_text = &mt('Request LON-CAPA account'); + my $submit_text = &mt('Sign-up'); my $emailform = ''; if (grep(/^login$/,@{$cancreate})) { - $output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.','
').'

'; + $output .= &mt('Provide your e-mail address to sign up for a Learn Physics account if you do not have a log-in ID at your institution.','
').'

'; } else { $output .= '
'; } @@ -539,6 +543,7 @@ sub process_email_request { $env{'form.recaptcha_challenge_field'}, $env{'form.recaptcha_response_field'}, ); + # PRIVATE key from https://www.google.com/recaptcha if (!$captcha_result->{is_valid}) { $output = &invalid_state('captcha',$domdesc,$contact_name, $contact_email); @@ -605,13 +610,13 @@ sub send_token { 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 [_1] account.',$showtime,$domdesc).). "\n". + my $mailmsg = &mt('A request was submitted on [_1] for creation of a [_1] 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); 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 account creation process.').'
'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'',''); + $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 { $msg .= ''. &mt('An error occurred when sending a message to the e-mail address you provided.').'
'. @@ -1195,9 +1200,9 @@ sub linkto_email_help { sub create_recaptcha { my $captcha = Captcha::reCAPTCHA->new; + # generate PUBLICKEY from https://www.google.com/recaptcha return $captcha->get_options_setter({theme => 'white'})."\n". - $captcha->get_html('PUBLICKEY'); # generate public key for IP - # from http://recaptcha.net/ + $captcha->get_html('PUBLICKEY'); } sub getkeys {