--- loncom/interface/loncreateuser.pm 2021/09/25 20:35:26 1.455 +++ loncom/interface/loncreateuser.pm 2021/12/10 04:14:52 1.456 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.455 2021/09/25 20:35:26 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.456 2021/12/10 04:14:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,6 +71,7 @@ use Apache::longroup; use Apache::lonuserutils; use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); +use HTML::Entities; my $loginscript; # piece of javascript used in two separate instances my $authformnop; @@ -2441,8 +2442,8 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, - $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_; + my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now, + $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_; my ($output,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); @@ -2675,16 +2676,21 @@ sub personal_data_display { if ($captchaform) { $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}.'*', 'LC_pick_box_title')."\n". - $captchaform."\n". + $captchaform."\n".'

'. &Apache::lonhtmlcommon::row_closure(1); $rowcount ++; } - my $submit_text = &mt('Create account'); - $output .= &Apache::lonhtmlcommon::row_title()."\n". - '
'. - ''. - &Apache::lonhtmlcommon::row_closure(1); + if ($showsubmit) { + my $submit_text = &mt('Create account'); + $output .= &Apache::lonhtmlcommon::row_title()."\n". + '
'; + if ($usertype ne '') { + $output .= ''; + } + $output .= &Apache::lonhtmlcommon::row_closure(1); + } } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) {