--- loncom/interface/createaccount.pm 2012/02/08 19:08:41 1.40.2.5.2.2
+++ loncom/interface/createaccount.pm 2012/02/12 19:59:31 1.40.2.5.2.4
@@ -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.2 2012/02/08 19:08:41 raeburn Exp $
+# $Id: createaccount.pm,v 1.40.2.5.2.4 2012/02/12 19:59:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -248,7 +248,7 @@ sub handler {
sub get_custom_name {
my ($domain) = @_;
if ($domain eq 'relate') {
- return 'Learn-Physics';
+ return 'Mechanics Online';
} else {
return lc($domain);
}
@@ -387,7 +387,7 @@ function validate_email() {
var lcemail = emailaddr.toLowerCase();
if (emailaddr != lcemail) {
field.value = lcemail;
- alert("Learn-Physics usernames are all lower case.\\nAccordingly your username will be "+lcemail+" once activated.");
+ alert("Mechanics Online usernames are all lower case.\\nAccordingly your username will be "+lcemail+" once activated.");
}
}
return true;
@@ -418,7 +418,7 @@ sub print_username_form {
}
if (grep(/^email$/,@{$cancreate})) {
$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('You are about to sign-up for a Mechanics Online 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.').' ';
@@ -427,7 +427,7 @@ sub print_username_form {
my $submit_text = &mt('Sign-up');
my $emailform = '';
if (grep(/^login$/,@{$cancreate})) {
- $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.',' ').'
';
+ $output .= &mt('Provide your e-mail address to sign up for a Mechanics Online account if you do not have a log-in ID at your institution.',' ').'
';
} else {
$output .= ' ';
}
@@ -543,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);
@@ -609,7 +610,7 @@ 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,
@@ -1199,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 {