--- loncom/interface/createaccount.pm 2015/06/09 21:22:55 1.70 +++ loncom/interface/createaccount.pm 2016/02/19 20:28:46 1.72 @@ -4,7 +4,7 @@ # kerberos, or SSO) or an e-mail address. Requests to use an e-mail address as # username may be processed automatically, or may be queued for approval. # -# $Id: createaccount.pm,v 1.70 2015/06/09 21:22:55 damieng Exp $ +# $Id: createaccount.pm,v 1.72 2016/02/19 20:28:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -319,7 +319,7 @@ sub print_footer { $r->print('
'); @@ -366,7 +366,7 @@ sub selfenroll_crumbs { } sub javascript_setforms { - my ($now,$emailusername,$captcha,$usertype) = @_; + my ($now,$emailusername,$captcha,$usertype,$recaptchaversion) = @_; my ($setuserinfo,@required,$requiredchk); if (ref($emailusername) eq 'HASH') { if (ref($emailusername->{$usertype}) eq 'HASH') { @@ -382,9 +382,11 @@ sub javascript_setforms { $setuserinfo .= ' server.elements.code.value=client.elements.code.value;'."\n". ' server.elements.crypt.value=client.elements.crypt.value;'."\n"; } elsif ($captcha eq 'recaptcha') { - $setuserinfo .= + if ($recaptchaversion ne '2') { + $setuserinfo .= ' server.elements.recaptcha_challenge_field.value=client.elements.recaptcha_challenge_field.value;'."\n". ' server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n"; + } } } if (@required) { @@ -431,7 +433,7 @@ $requiredchk initkeys(); server.elements.upass.value - = crypted(client.elements.upass$now.value); + = getCrypted(client.elements.upass$now.value); client.elements.uname.value=''; client.elements.upass$now.value=''; @@ -444,9 +446,13 @@ $setuserinfo } return false; } + // ]]> ENDSCRIPT + if (($captcha eq 'recaptcha') && ($recaptchaversion eq '2')) { + $js .= "\n".''."\n"; + } return $js; } @@ -543,7 +549,8 @@ sub print_username_form { } if (grep(/^email$/,@{$cancreate})) { $output .= '