--- loncom/interface/loncreateuser.pm 2016/01/31 21:25:38 1.407
+++ loncom/interface/loncreateuser.pm 2016/02/19 02:39:07 1.409
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.407 2016/01/31 21:25:38 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.409 2016/02/19 02:39:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2164,7 +2164,7 @@ sub modify_login_block {
sub personal_data_display {
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
- $now,$captchaform,$emailusername,$usertype) = @_;
+ $now,$captchaform,$emailusername,$usertype,$recaptchaversion) = @_;
my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
@@ -2244,8 +2244,8 @@ sub personal_data_display {
'';
$rowcount ++;
$output .= &Apache::lonhtmlcommon::row_closure(1);
- my $upassone = '';
- my $upasstwo = '';
+ my $upassone = '';
+ my $upasstwo = '';
$output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'*',
'LC_pick_box_title',
'LC_oddrow_value')."\n".
@@ -2352,8 +2352,11 @@ sub personal_data_display {
if (($context eq 'selfcreate') && ($newuser eq 'email')) {
if ($captchaform) {
$output .= &Apache::lonhtmlcommon::row_title($lt{'valid'},
- 'LC_pick_box_title')."\n".
- $captchaform."\n".'
'.
+ 'LC_pick_box_title')."\n";
+ if ($recaptchaversion >=2) {
+ $output .= ''."\n";
+ }
+ $output .= $captchaform."\n".'
'.
&Apache::lonhtmlcommon::row_closure(1);
$rowcount ++;
}