version 1.40.2.5.2.5, 2012/02/13 05:24:22
|
version 1.40.2.5.2.7, 2012/02/13 17:50:35
|
Line 57 sub handler {
|
Line 57 sub handler {
|
|
|
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain'); |
|
my $privkey = $r->dir_config('reCAPTCHA_PRIVATE'); |
|
my $pubkey = $r->dir_config('reCAPTCHA_PUBLIC'); |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token','courseid']); |
&Apache::lonacc::get_posted_cgi($r); |
&Apache::lonacc::get_posted_cgi($r); |
Line 225 sub handler {
|
Line 227 sub handler {
|
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc, |
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc, |
$contact_name,$contact_email,$cancreate, |
$contact_name,$contact_email,$cancreate, |
$lonhost,$domconfig{'usercreation'}, |
$lonhost,$domconfig{'usercreation'}, |
$courseid); |
$courseid,$privkey); |
} elsif (!$token) { |
} elsif (!$token) { |
&print_header($r,$start_page,$courseid); |
&print_header($r,$start_page,$courseid); |
my $now=time; |
my $now=time; |
Line 238 sub handler {
|
Line 240 sub handler {
|
$r->print(&javascript_validmail()); |
$r->print(&javascript_validmail()); |
} |
} |
$output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost, |
$output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost, |
$courseid); |
$courseid,$pubkey); |
} |
} |
$r->print($output); |
$r->print($output); |
&print_footer($r); |
&print_footer($r); |
Line 398 ENDSCRIPT
|
Line 400 ENDSCRIPT
|
} |
} |
|
|
sub print_username_form { |
sub print_username_form { |
my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_; |
my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid,$pubkey) = @_; |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
unam => 'username', |
unam => 'username', |
udom => 'domain', |
udom => 'domain', |
Line 433 sub print_username_form {
|
Line 435 sub print_username_form {
|
$lt{'inst'}.'<br />'. |
$lt{'inst'}.'<br />'. |
$lt{'aftr'}.'<br />'. |
$lt{'aftr'}.'<br />'. |
$lt{'thes'}.'<br />'; |
$lt{'thes'}.'<br />'; |
my $captchaform = &create_recaptcha(); |
my $captchaform = &create_recaptcha($pubkey); |
if ($captchaform) { |
if ($captchaform) { |
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="" />'; |
Line 527 sub login_box {
|
Line 529 sub login_box {
|
|
|
sub process_email_request { |
sub process_email_request { |
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate, |
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate, |
$server,$settings,$courseid) = @_; |
$server,$settings,$courseid,$privkey) = @_; |
$useremail = lc($env{'form.useremail'}); |
$useremail = lc($env{'form.useremail'}); |
my $output; |
my $output; |
if (ref($cancreate) eq 'ARRAY') { |
if (ref($cancreate) eq 'ARRAY') { |
Line 549 sub process_email_request {
|
Line 551 sub process_email_request {
|
my $captcha = Captcha::reCAPTCHA->new; |
my $captcha = Captcha::reCAPTCHA->new; |
my $captcha_result = |
my $captcha_result = |
$captcha->check_answer( |
$captcha->check_answer( |
'PRIVATEKEY', |
$privkey, |
$ENV{'REMOTE_ADDR'}, |
$ENV{'REMOTE_ADDR'}, |
$env{'form.recaptcha_challenge_field'}, |
$env{'form.recaptcha_challenge_field'}, |
$env{'form.recaptcha_response_field'}, |
$env{'form.recaptcha_response_field'}, |
Line 1210 sub linkto_email_help {
|
Line 1212 sub linkto_email_help {
|
} |
} |
|
|
sub create_recaptcha { |
sub create_recaptcha { |
|
my ($pubkey) = @_; |
my $captcha = Captcha::reCAPTCHA->new; |
my $captcha = Captcha::reCAPTCHA->new; |
# generate PUBLICKEY from https://www.google.com/recaptcha |
# 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'); |
$captcha->get_html($pubkey); |
} |
} |
|
|
sub getkeys { |
sub getkeys { |