--- loncom/interface/createaccount.pm 2012/02/13 05:24:22 1.40.2.5.2.5 +++ loncom/interface/createaccount.pm 2012/02/14 01:06:12 1.40.2.5.2.8 @@ -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.5 2012/02/13 05:24:22 raeburn Exp $ +# $Id: createaccount.pm,v 1.40.2.5.2.8 2012/02/14 01:06:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,6 +57,8 @@ sub handler { my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown'); 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::lonacc::get_posted_cgi($r); @@ -225,7 +227,7 @@ sub handler { $output = &process_email_request($env{'form.useremail'},$domain,$domdesc, $contact_name,$contact_email,$cancreate, $lonhost,$domconfig{'usercreation'}, - $courseid); + $courseid,$privkey); } elsif (!$token) { &print_header($r,$start_page,$courseid); my $now=time; @@ -238,7 +240,7 @@ sub handler { $r->print(&javascript_validmail()); } $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost, - $courseid); + $courseid,$pubkey); } $r->print($output); &print_footer($r); @@ -398,7 +400,7 @@ ENDSCRIPT } sub print_username_form { - my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_; + my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid,$pubkey) = @_; my %lt = &Apache::lonlocal::texthash ( unam => 'username', udom => 'domain', @@ -407,11 +409,10 @@ sub print_username_form { crea => 'Create account with a username provided by this institution', crlc => 'Create LON-CAPA account', type => 'Type in your log-in ID and password to find out.', - sign => 'You are about to sign-up for the Mechanics Online course.', 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', + thes => 'The same account will be used for access to the Mechanics Online course, once it becomes available on March 1, 2012.', ); my $output; if (ref($cancreate) eq 'ARRAY') { @@ -428,12 +429,13 @@ sub print_username_form { } if (grep(/^email$/,@{$cancreate})) { $output .= '
'.
+ &mt('You are about to sign-up for the [_1]Mechanics Online[_2] course.','','').'
'.
+ $lt{'plse'}.'