version 1.40.2.5.2.2, 2012/02/08 19:08:41
|
version 1.40.2.5.2.4, 2012/02/12 19:59:31
|
Line 248 sub handler {
|
Line 248 sub handler {
|
sub get_custom_name { |
sub get_custom_name { |
my ($domain) = @_; |
my ($domain) = @_; |
if ($domain eq 'relate') { |
if ($domain eq 'relate') { |
return 'Learn-Physics'; |
return 'Mechanics Online'; |
} else { |
} else { |
return lc($domain); |
return lc($domain); |
} |
} |
Line 387 function validate_email() {
|
Line 387 function validate_email() {
|
var lcemail = emailaddr.toLowerCase(); |
var lcemail = emailaddr.toLowerCase(); |
if (emailaddr != lcemail) { |
if (emailaddr != lcemail) { |
field.value = 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; |
return true; |
Line 418 sub print_username_form {
|
Line 418 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>'. |
&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.').'<br />'. |
&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.').'<br />'. |
&mt('Your performance on the test will help both you and us gauge your readiness to take the course.').'<br />'. |
&mt('Your performance on the test will help both you and us gauge your readiness to take the course.').'<br />'. |
&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.').'<br />'. |
&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.').'<br />'. |
&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.').'<br />'; |
&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.').'<br />'; |
Line 427 sub print_username_form {
|
Line 427 sub print_username_form {
|
my $submit_text = &mt('Sign-up'); |
my $submit_text = &mt('Sign-up'); |
my $emailform = '<input type="text" name="useremail" size="25" value="" />'; |
my $emailform = '<input type="text" name="useremail" size="25" value="" />'; |
if (grep(/^login$/,@{$cancreate})) { |
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.','<br />').'<br /><br />'; |
$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.','<br />').'<br /><br />'; |
} else { |
} else { |
$output .= '<br />'; |
$output .= '<br />'; |
} |
} |
Line 543 sub process_email_request {
|
Line 543 sub process_email_request {
|
$env{'form.recaptcha_challenge_field'}, |
$env{'form.recaptcha_challenge_field'}, |
$env{'form.recaptcha_response_field'}, |
$env{'form.recaptcha_response_field'}, |
); |
); |
|
# PRIVATE key from https://www.google.com/recaptcha |
if (!$captcha_result->{is_valid}) { |
if (!$captcha_result->{is_valid}) { |
$output = &invalid_state('captcha',$domdesc,$contact_name, |
$output = &invalid_state('captcha',$domdesc,$contact_name, |
$contact_email); |
$contact_email); |
Line 609 sub send_token {
|
Line 610 sub send_token {
|
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 $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]', |
&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); |
"\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token); |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
Line 1199 sub linkto_email_help {
|
Line 1200 sub linkto_email_help {
|
|
|
sub create_recaptcha { |
sub create_recaptcha { |
my $captcha = Captcha::reCAPTCHA->new; |
my $captcha = Captcha::reCAPTCHA->new; |
|
# generate PUBLICKEY from https://www.google.com/recaptcha |
return $captcha->get_options_setter({theme => 'white'})."\n". |
return $captcha->get_options_setter({theme => 'white'})."\n". |
$captcha->get_html('PUBLICKEY'); # generate public key for IP |
$captcha->get_html('PUBLICKEY'); |
# from http://recaptcha.net/ |
|
} |
} |
|
|
sub getkeys { |
sub getkeys { |