--- loncom/interface/createaccount.pm 2024/08/22 20:12:39 1.72.4.7.2.3 +++ loncom/interface/createaccount.pm 2021/09/26 20:11:14 1.84 @@ -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.72.4.7.2.3 2024/08/22 20:12:39 raeburn Exp $ +# $Id: createaccount.pm,v 1.84 2021/09/26 20:11:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::lonacc; use Apache::lonnet; use Apache::loncommon; use Apache::lonhtmlcommon; +use Apache::lonuserutils; use Apache::lonlocal; use Apache::lonauth; use Apache::resetpw; @@ -437,9 +438,7 @@ sub javascript_setforms { } $setuserinfo .= ' server.elements.'.$key.'.value=client.elements.'.$key.'.value;'."\n"; } - if ($usertype ne '') { - $setuserinfo .= ' server.elements.type.value=client.elements.type.value;'."\n"; - } + $setuserinfo .= ' server.elements.type.value=client.elements.type.value;'."\n"; } if ($captcha eq 'original') { $setuserinfo .= ' server.elements.code.value=client.elements.code.value;'."\n". @@ -527,7 +526,7 @@ sub javascript_checkpass { my $mismatchpass = &mt('The passwords you entered did not match.')."\n". &mt('Please try again.'); my ($numrules,$intargjs) = - &Apache::loncommon::passwd_validation_js('upass',$domain); + &Apache::lonuserutils::passwd_validation_js('upass',$domain); &js_escape(\$nopass); &js_escape(\$mismatchpass); my $js = <<"ENDSCRIPT"; @@ -740,7 +739,7 @@ sub login_box { $lonhost); $output = &serverform($logtoken,$lonhost,undef,$courseid,$context); my $unameform = ''; - my $upassform = ''; + my $upassform = ''; $output .= '
'."\n"; + my $endclientform = ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''.&mt('Fields marked [_1]*[_2] are required.','','').'
'; my ($datatable,$rowcount) = &Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate', - '','','',$now,$captchaform, + '','',$now,$captchaform, $emailusername,$usertype, - $usernameset,$condition,$excluded, - $showsubmit); + $usernameset,$condition,$excluded); if ($rowcount) { - $output .= ''. - &mt('Fields marked [_1]*[_2] are required.','',''). - '
'; + if ($rowcount) { + $output .= '