--- loncom/interface/createaccount.pm	2022/02/20 19:53:07	1.72.4.7.2.1
+++ loncom/interface/createaccount.pm	2020/12/18 15:23:02	1.82
@@ -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.1 2022/02/20 19:53:07 raeburn Exp $
+# $Id: createaccount.pm,v 1.82 2020/12/18 15:23:02 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";
@@ -1182,54 +1181,42 @@ sub print_dataentry_form {
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
         my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount:createaccount',
                                            $lonhost);
-        my $showsubmit = 1;
-        my $serverform =
+        $output .=
             '<form name="createaccount" method="post" target="_top" action="/adm/createaccount">';
         if ($courseid ne '') {
-            $serverform .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n";
+            $output .= '<input type="hidden" name="courseid" value="'.$courseid.'"/>'."\n";
         }
         if (ref($emailusername) eq 'HASH') {
             if (ref($emailusername->{$usertype}) eq 'HASH') {
                 foreach my $field (sort(keys(%{$emailusername->{$usertype}}))) {
-                    $serverform .= '<input type="hidden" name="'.$field.'" value="" />'."\n";
+                    $output .= '<input type="hidden" name="'.$field.'" value="" />'."\n";
                 }
             }
         }
         if ($captcha eq 'original') {
-            $serverform .= '
+            $output .= '
    <input type="hidden" name="crypt" value="" />
    <input type="hidden" name="code" value="" />
 ';
         } elsif ($captcha eq 'recaptcha') {
             if ($recaptchaversion eq '2') {
-                $serverform .= &Apache::lonhtmlcommon::start_pick_box().
-                               &Apache::lonhtmlcommon::row_title(&mt('Validation').'<b>*</b>',
-                                                                 'LC_pick_box_title',
-                                                                 'LC_oddrow_value')."\n".
-                                                                 $captchaform.
-                               &Apache::lonhtmlcommon::row_closure(1)."\n".
-                               &Apache::lonhtmlcommon::row_title()."\n".
-                               '<br /><input type="button" name="createaccount" value="'.
-                               &mt('Create account').'" onclick="checkpass('."'createaccount','newemail'".')" />'.
-                               &Apache::lonhtmlcommon::row_closure(1)."\n".
-                               &Apache::lonhtmlcommon::end_pick_box();
+                $output .= "$captchaform\n";
                 undef($captchaform);
-                undef($showsubmit);
             } else {
-                $serverform .= '
+                $output .= '
    <input type="hidden" name="recaptcha_challenge_field" value="" />
    <input type="hidden" name="recaptcha_response_field" value="" />
 ';
             }
         }
         if ($usertype ne '') {
-            $serverform .= '<input type="hidden" name="type" value="'.
-                           &HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n";
+            $output .= '<input type="hidden" name="type" value="'.
+                       &HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n";
         }
         if ($usernameset eq 'free') {
-            $serverform .= '<input type="hidden" name="username" value="" />'."\n"; 
+            $output .= '<input type="hidden" name="username" value="" />'."\n"; 
         }
-        $serverform .= <<"ENDSERVERFORM";
+        $output .= <<"ENDSERVERFORM";
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
@@ -1241,33 +1228,25 @@ sub print_dataentry_form {
 ENDSERVERFORM
         my $beginclientform = '<form name="newemail" method="post" action="" '.
                               'onsubmit="return checkpass('."'createaccount','newemail'".');">'."\n";
-        my $endclientform;
-        unless ($showsubmit) {
-            if ($usertype ne '') {
-                $endclientform = '<input type="hidden" name="type" value="'.
-                                 &HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n";
-            }
-        }
-        $endclientform .= '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
-                          '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
-                          '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
-                          '</form>'."\n";
+        my $endclientform = '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
+                            '<input type="hidden" name="lextkey" value="'.$lextkey.'" />'."\n".
+                            '<input type="hidden" name="uextkey" value="'.$uextkey.'" />'."\n".
+                            '</form>'."\n".
+                            '<p class="LC_info">'.&mt('Fields marked [_1]*[_2] are required.','<b>','</b>').'</p>';
         my ($datatable,$rowcount) =
             &Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate',
                                                           '','',$now,$captchaform,
                                                           $emailusername,$usertype,
-                                                          $usernameset,$condition,$excluded,
-                                                          $showsubmit);
+                                                          $usernameset,$condition,$excluded);
         if ($rowcount) {
-            $output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform.'</div>'."\n".
-                       '<div class="LC_clear_float_footer"></div>'."\n";
+            $output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform;
         } else {
             $output .= $beginclientform.$endclientform;
         }
-        $output .= $serverform.
-                   '<p class="LC_info">'.
-                   &mt('Fields marked [_1]*[_2] are required.','<b>','</b>').
-                   '</p>';
+        if ($rowcount) {
+            $output .= '</div>'."\n".
+                       '<div class="LC_clear_float_footer"></div>'."\n";
+        }
     } else {
         $output = &mt('Could not load javascript file [_1]','<tt>londes.js</tt>');
     }