--- loncom/interface/createaccount.pm 2020/12/18 15:23:02 1.82 +++ loncom/interface/createaccount.pm 2021/12/10 04:14:52 1.85 @@ -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.82 2020/12/18 15:23:02 raeburn Exp $ +# $Id: createaccount.pm,v 1.85 2021/12/10 04:14:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -438,7 +438,9 @@ sub javascript_setforms { } $setuserinfo .= ' server.elements.'.$key.'.value=client.elements.'.$key.'.value;'."\n"; } - $setuserinfo .= ' server.elements.type.value=client.elements.type.value;'."\n"; + if ($usertype ne '') { + $setuserinfo .= ' server.elements.type.value=client.elements.type.value;'."\n"; + } } if ($captcha eq 'original') { $setuserinfo .= ' server.elements.code.value=client.elements.code.value;'."\n". @@ -1181,42 +1183,54 @@ sub print_dataentry_form { my ($lextkey,$uextkey) = &getkeys($lkey,$ukey); my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount', $lonhost); - $output .= + my $showsubmit = 1; + my $serverform = '
'."\n". - ''.&mt('Fields marked [_1]*[_2] are required.','','').'
'; + my $endclientform; + unless ($showsubmit) { + if ($usertype ne '') { + $endclientform = ''."\n"; + } + } + $endclientform .= ''."\n". + ''."\n". + ''."\n". + ''."\n"; my ($datatable,$rowcount) = &Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate', '','',$now,$captchaform, $emailusername,$usertype, - $usernameset,$condition,$excluded); + $usernameset,$condition,$excluded, + $showsubmit); if ($rowcount) { - $output .= ''. + &mt('Fields marked [_1]*[_2] are required.','',''). + '
'; } else { $output = &mt('Could not load javascript file [_1]','londes.js'); }