--- loncom/interface/createaccount.pm	2021/12/12 22:10:45	1.72.4.7
+++ loncom/interface/createaccount.pm	2017/07/26 19:45:45	1.73
@@ -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 2021/12/12 22:10:45 raeburn Exp $
+# $Id: createaccount.pm,v 1.73 2017/07/26 19:45:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,6 @@ use Apache::lonacc;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonhtmlcommon;
-use Apache::lonuserutils;
 use Apache::lonlocal;
 use Apache::lonauth;
 use Apache::resetpw;
@@ -151,7 +150,7 @@ sub handler {
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     my ($cancreate,$statustocreate,$statusforemail,$emailusername,
-        $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle) =
+        $verification,$emaildomain,$types,$usertypes,$othertitle) =
         &get_creation_controls($domain,$domconfig{'usercreation'});
     my ($additems,$pagetitle);
     if (ref($cancreate) eq 'ARRAY') {
@@ -159,15 +158,14 @@ sub handler {
                 ($env{'form.create_with_email'})) {
             if ((grep(/^email$/,@{$cancreate})) && (ref($statusforemail) eq 'ARRAY')) {
                 my $usertype = &get_usertype($domain);
-                if ((($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) && 
-                    (@{$statusforemail} > 0)) {
+                if (($usertype ne '') && (grep(/^\Q$usertype\E$/,@{$statusforemail}))) {
+                    $js .= &username_js();
+                } elsif (($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) {
                     $js .= &setelements_js($statusforemail,$types,$usertypes,$othertitle);
                     $additems = {'add_entries' => { 'onload' => "setElements();"} };
-                    if ((@{$cancreate} == 1) && (@{$statusforemail} > 0)) {
+                    if (@{$cancreate} == 1) {
                         $pagetitle = 'Select affiliation';
                     }
-                } else {
-                    $js .= &username_js();
                 }
             }
         }
@@ -257,32 +255,18 @@ sub handler {
             return OK;
         }
     }
-    my ($usernameset,$condition,$excluded,$hascustom);
+    my ($usernameset,$condition);
     if ((grep(/^email$/,@{$cancreate})) && (($env{'form.create_with_email'}) ||
                                             ((!$token) && ($env{'form.phase'} eq '')))) {
         my $usertype = &get_usertype($domain);
-        if ($usertype eq '') {
-            $usertype = 'default';
-        }
         if (ref($verification) eq 'HASH') {
-            if ($verification->{$usertype} =~ /^(free|first)$/) {
-                $usernameset = $verification->{$usertype};
-            }
-        }
-        if (ref($emailoptions) eq 'HASH') {
-            if ($emailoptions->{$usertype} =~ /^(inst|noninst)$/) {
-                my $chosen = $1;
+            if ($verification->{$usertype} eq 'other') {
+                $usernameset = 1;
                 if (ref($emaildomain) eq 'HASH') {
-                    if (ref($emaildomain->{$usertype}) eq 'HASH') {
-                        if ($chosen eq 'inst') {
-                            $condition = $emaildomain->{$usertype}->{$chosen};
-                        } else {
-                            $excluded = $emaildomain->{$usertype}->{$chosen};
-                        }
+                    if ($emaildomain->{$usertype} ne '') {
+                        $condition = $emaildomain->{$usertype};
                     }
                 }
-            } elsif ($emailoptions->{$usertype} eq 'custom') {
-                $hascustom = 1;
             }
         }
     }
@@ -317,19 +301,16 @@ sub handler {
     } elsif ($env{'form.create_with_email'}) {
         &print_header($r,$start_page,$courseid);
         my $usertype = &get_usertype($domain);
-        if ($usertype eq '') {
-            $usertype = 'default';
-        }
         $output = &process_email_request($env{'form.uname'},$domain,$domdesc,
                                          $contact_name,$contact_email,$cancreate,
                                          $lonhost,$domconfig{'usercreation'},
                                          $emailusername,$courseid,$usertype,
-                                         $usernameset,$condition,$excluded,$hascustom);
+                                         $usernameset,$condition);
     } elsif (!$token) {
         &print_header($r,$start_page,$courseid,$pagetitle);
         my $now=time;
         if ((grep(/^login$/,@{$cancreate})) && (!grep(/^email$/,@{$cancreate}))) {
-            if (open(my $jsh,"<","$include/londes.js")) {
+            if (open(my $jsh,"<$include/londes.js")) {
                 while(my $line = <$jsh>) {
                     $r->print($line);
                 }
@@ -338,13 +319,13 @@ sub handler {
             }
         }
         if (grep(/^email$/,@{$cancreate})) {
-            $r->print(&javascript_validmail($condition));
+            $r->print(&javascript_validmail());
         }
         my $usertype = &get_usertype($domain);
         $output = &print_username_form($r,$domain,$domdesc,$cancreate,$now,$lonhost,
                                        $include,$courseid,$emailusername,
                                        $statusforemail,$usernameset,$condition,
-                                       $excluded,$usertype,$types,$usertypes,$othertitle);
+                                       $usertype,$types,$usertypes,$othertitle);
     }
     $r->print($output);
     &print_footer($r);
@@ -428,7 +409,7 @@ sub selfenroll_crumbs {
 }
 
 sub javascript_setforms {
-    my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition,$excluded) =  @_;
+    my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition) =  @_;
     my ($setuserinfo,@required,$requiredchk);
     if (ref($emailusername) eq 'HASH') {
         if (ref($emailusername->{$usertype}) eq 'HASH') {  
@@ -438,9 +419,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".
@@ -452,7 +431,7 @@ sub javascript_setforms {
                 '                    server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n";
             }
         }
-        if ($usernameset eq 'free') {
+        if ($usernameset) {
             $setuserinfo .=
                 '                    server.elements.username.value=client.elements.username.value;'."\n";
         }
@@ -499,8 +478,10 @@ $requiredchk
                 uextkey=client.elements.uextkey.value;
                 lextkey=client.elements.lextkey.value;
                 initkeys();
+
                 server.elements.upass.value
                     = getCrypted(client.elements.upass$now.value);
+
                 client.elements.uname.value='';
                 client.elements.upass$now.value='';
                 if (context == 'email') {
@@ -523,12 +504,10 @@ ENDSCRIPT
 }
 
 sub javascript_checkpass {
-    my ($now,$context,$domain) = @_;
+    my ($now,$context) = @_;
     my $nopass = &mt('You must enter a password.');
     my $mismatchpass = &mt('The passwords you entered did not match.')."\n".
                        &mt('Please try again.'); 
-    my ($numrules,$intargjs) =
-        &Apache::lonuserutils::passwd_validation_js('upass',$domain);
     &js_escape(\$nopass);
     &js_escape(\$mismatchpass);
     my $js = <<"ENDSCRIPT";
@@ -545,10 +524,6 @@ sub javascript_checkpass {
                 return false;
             }
             if (upass == upasscheck) {
-                var numrules = $numrules;
-                if (numrules > 0) {
-$intargjs
-                }
                 client.elements.upasscheck$now.value='';
                 if (validate_email(client)) {
                     send(one,two,'$context');
@@ -568,11 +543,9 @@ ENDSCRIPT
 }
 
 sub javascript_validmail {
-    my ($condition) = @_;
     my %js_lt = &Apache::lonlocal::texthash (
                email => 'The e-mail address you entered',
                notv  => 'is not a valid e-mail address',
-               avae  => 'A valid e-mail address is not formed when the value you entered is combined with the required domain',
     );
     my $output =  "\n".'<script type="text/javascript">'."\n".
                   '// <![CDATA['."\n".
@@ -581,13 +554,8 @@ sub javascript_validmail {
     $output .= <<"ENDSCRIPT";
 function validate_email(client) {
     field = client.uname;
-    var condition = '$condition';
-    if (validmail(field,condition) == false) {
-        if ((condition != undefined) && (condition != '')) {
-            alert("$js_lt{'avae'}: "+condition);
-        } else {
-            alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
-        }
+    if (validmail(field) == false) {
+        alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
         return false;
     }
     return true;
@@ -599,7 +567,7 @@ ENDSCRIPT
 
 sub print_username_form {
     my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername,
-        $statusforemail,$usernameset,$condition,$excluded,$usertype,$types,$usertypes,
+        $statusforemail,$usernameset,$condition,$usertype,$types,$usertypes,
         $othertitle) = @_;
     my %lt = &Apache::lonlocal::texthash (
                                          crac => 'Create account with a username provided by this institution',
@@ -627,22 +595,20 @@ sub print_username_form {
         if (grep(/^email$/,@{$cancreate})) {
             $output .= '<div class="LC_left_float"><h3>'.$lt{'crae'}.'</h3>';
             if ($usertype ne '') {
-                if ((ref($statusforemail) eq 'ARRAY') && (@{$statusforemail} > 0)) {
+                if (ref($statusforemail) eq 'ARRAY') {
                     unless (grep(/^\Q$usertype\E$/,@{$statusforemail})) {
                         undef($usertype);
                     }
-                } elsif ($usertype ne 'default') {
-                    undef($usertype);
                 }
             }
             if (($usertype eq '') && (ref($statusforemail) eq 'ARRAY') && 
-                (@{$statusforemail} > 0) && (ref($types) eq 'ARRAY') && (@{$types} > 0)) {
+                (@{$statusforemail}) && (ref($types) eq 'ARRAY')) {
                 my @posstypes = @{$types};
                 unless (grep(/^default$/,@posstypes)) {
                     push(@posstypes,'default');
                 }
                 $output .= '<p>'.&mt('Choose your affiliation at [_1]',$domdesc).'</p>'."\n".
-                           '<form name="reportstatus" id="LC_reportstatus" action="/adm/createaccount" method="post" '.
+                           '<form name="reportstatus" id="LC_reportstatus" action="" method="post" '.
                            'onsubmit="return checkVerification();"><p>';
                 foreach my $type (@posstypes) {
                     my $name;
@@ -656,11 +622,7 @@ sub print_username_form {
                             }
                         }
                     }
-                    my $checked;
-                    if ($env{'form.type'} eq $type) {
-                        $checked = ' checked="checked"';
-                    }
-                    $output .= '<label><input type="radio" name="type" value="'.$type.'"'.$checked.' />'.
+                    $output .= '<label><input type="radio" name="type" value="'.$type.'" />'.
                                $name.'</label>'.('&nbsp;'x2);
                 }
                 if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
@@ -697,24 +659,9 @@ sub print_username_form {
                         $output .= $prompt.'<br />'.
                                    $lt{'yopw'}.'<br />';
                     }
-                    if ($usertype eq '') {
-                        $usertype = 'default';
-                    } elsif (ref($usertypes) eq 'HASH') {
-                        my $usertitle;
-                        if ($usertype eq 'default') {
-                            $usertitle = $othertitle;
-                        } elsif (exists($usertypes->{$usertype})) {
-                            $usertitle = $usertypes->{$usertype};
-                        }
-                        if ($usertitle ne '') {
-                            $output .= &mt('Self-reported affiliation: [_1]',
-                                           '<span style="font-style: italic;">'.$usertitle.'</span>').
-                                       '<br />';
-                        }
-                    }
                     $output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform,
                                                      $courseid,$emailusername,$captcha,$usertype,
-                                                     $recaptchaversion,$usernameset,$condition,$excluded);
+                                                     $recaptchaversion,$usernameset,$condition);
                 }
             }
             $output .= '</div>';
@@ -782,52 +729,42 @@ sub login_box {
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
         $server,$settings,$emailusername,$courseid,$usertype,$usernameset,
-        $condition,$excluded,$hascustom) = @_;
+        $condition) = @_;
     my ($output,$uname);
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
             $output = &invalid_state('noemails',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
-        } elsif ((($condition ne '') && ($useremail !~ /^[^\@]+$/)) ||
-                 (($condition eq '') && ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) {
+        } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
             $output = &invalid_state('baduseremail',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
         } else {
             $useremail =~ s/^\s+|\s+$//g;
             my $possuname;
-            if ($condition ne '') {
-                if ($usernameset eq 'first') {
-                    $possuname = $useremail;
-                }
-                $useremail .= $condition;
-            } elsif ($excluded ne '') {
-                if ($useremail =~ /^[^\@]+\Q$excluded\E$/) {
-                    $output = &invalid_state('userrules',$domdesc,
-                                     $contact_name,$contact_email);
-                    return $output;
-                } 
-            }
-            if (($usernameset eq 'free') && ($env{'form.username'} ne '')) {
+            if ($env{'form.username'}) {
                 $possuname = $env{'form.username'};
-            } elsif (($usernameset eq 'first') && ($condition eq '')) {
-                if ($condition eq '') {
-                    ($possuname) = ($useremail =~ /^([^\@]+)\@/);
-                }
-            }
-            if ($possuname ne '') {
                 $possuname  =~ s/^\s+|\s+$//g;
-                if ($possuname ne '') {
-                    $uname=&LONCAPA::clean_username($possuname);
-                    if ($uname ne $possuname) {
-                        $output = &invalid_state('badusername',$domdesc,
+            }
+            if (($usernameset) && ($possuname ne '')) {
+                if ($condition ne '') {
+                    if ($useremail =~ /\Q$condition\E/) {
+                        $uname = &LONCAPA::clean_username($possuname);
+                    } else {
+                        $output = &invalid_state('emailfail',$domdesc,
                                                  $contact_name,$contact_email);
                         return $output;
                     }
+                } else {
+                    $uname=&LONCAPA::clean_username($possuname);
                 }
-            }
-            if ($possuname eq '') {
+                if ($uname ne $possuname) {
+                    $output = &invalid_state('badusername',$domdesc,
+                                             $contact_name,$contact_email);
+                    return $output;
+                }
+            } else {
                 $uname=&LONCAPA::clean_username($useremail);
                 if ($useremail ne $uname) {
                     $output = &invalid_state('badusername',$domdesc,
@@ -843,24 +780,8 @@ sub process_email_request {
             } else {
                 my ($captcha_chk,$captcha_error) = &Apache::loncommon::captcha_response('usercreation',$server);
                 if ($captcha_chk != 1) {
-                    $output = '<span class="LC_warning">'.
-                              &mt('Validation of the code you entered failed.').'</span>'.
-                              '<br />'.$captcha_error."\n".'<br /><p>'.
-                               &mt('[_1]Return[_2] to the previous page to try again.',
-                                   '<a href="javascript:document.retryemail.submit();">','</a>')."\n".
-                              '<form name="retryemail" action="/adm/createaccount" method="post" />'.
-                              '<input type="hidden" name="domain" value="'.$domain.'" />'."\n";
-                    if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
-                        $output .= '<input type="hidden" name="courseid" value="'.$env{'form.courseid'}.'" />'."\n";
-                    }
-                    if ($env{'form.type'}) {
-                        my $usertype = &get_usertype($domain);
-                        if ($usertype ne '') {
-                            $output .= '<input type="hidden" name="type" value="'.$usertype.'" />'."\n".
-                                       '<input type="hidden" name="reportedtype" value="'.&mt('Submit').'" />'."\n";
-                        }
-                    }
-                    $output .= '</form></p>';
+                    $output = &invalid_state('captcha',$domdesc,$contact_name,
+                                             $contact_email,$captcha_error);
                     return $output;
                 }
                 my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
@@ -875,10 +796,10 @@ sub process_email_request {
                         }
                     }
                 }
-                if ($hascustom) {
+                if (($usernameset) && ($possuname ne '')) {
                     my $format_msg = 
                         &guest_format_check($useremail,$domain,$cancreate,
-                                            $settings,$usertype);
+                                            $settings);
                     if ($format_msg) {
                         $output = &invalid_state('userformat',$domdesc,$contact_name,
                                                  $contact_email,$format_msg);
@@ -918,74 +839,17 @@ sub send_token {
     $env{'form.logtoken'} =~ s/(`)//g;
     if ($env{'form.logtoken'}) {
         my $logtoken = $env{'form.logtoken'};
-        my $earlyout;
         my $tmpinfo=Apache::lonnet::reply('tmpget:'.$logtoken,$server);
         if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
             $msg = &mt('Information needed to process your request is missing, inaccessible or expired.')
-                  .'<br /><p>'.&mt('[_1]Return[_2] to the previous page to try again.',
-                                   '<a href="javascript:document.retryemail.submit();">','</a>');
-            $earlyout = 1;
+                  .'<br />'.&mt('Return to the previous page to try again.');
         } else {
             my $reply = &Apache::lonnet::reply('tmpdel:'.$logtoken,$server);
             unless ($reply eq 'ok') {
                 $msg .= &mt('Request could not be processed.');
             }
         }
-# Check if the password entered by the user satisfies domain's requirements
-        my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
-        my ($min,$max,@chars);
-        $min = $Apache::lonnet::passwdmin;
-        if (ref($passwdconf{'chars'}) eq 'ARRAY') {
-            if ($passwdconf{'min'} =~ /^\d+$/) {
-                if ($passwdconf{'min'} > $min) {
-                    $min = $passwdconf{'min'};
-                }
-            }
-            if ($passwdconf{'max'} =~ /^\d+$/) {
-                $max = $passwdconf{'max'};
-            }
-            @chars = @{$passwdconf{'chars'}};
-        }
-        my $encpass = $env{'form.upass'};
-        if ($encpass eq '') {
-            $msg = &mt('Password retrieved was blank.').
-                   '<br /><p>'.&mt('[_1]Return[_2] to the previous page to try again.',
-                                   '<a href="javascript:document.retryemail.submit();">','</a>');
-            $earlyout = 1;
-        } else {
-# Split the logtoken to retrieve the DES key and decrypt the encypted password
-            my ($key,$caller)=split(/&/,$tmpinfo);
-            if ($caller eq 'createaccount') {
-                my $plainpass = &Apache::loncommon::des_decrypt($key,$encpass);
-                if (($min > 0) || ($max ne '') || (@chars > 0)) {
-                    my $warning = &Apache::loncommon::check_passwd_rules($domain,$plainpass);
-                    if ($warning) {
-                        $msg = $warning.
-                               '<p>'.&mt('[_1]Return[_2] to the previous page to try again.',
-                                         '<a href="javascript:document.retryemail.submit();">','</a>');
-                        $earlyout = 1;
-                    }
-                }
-            }
-        }
-        if ($earlyout) {
-            $msg .= '<form name="retryemail" action="/adm/createaccount" method="post" />'.
-                    '<input type="hidden" name="domain" value="'.$domain.'" />'."\n";
-            if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
-                $msg .= '<input type="hidden" name="courseid" value="'.$env{'form.courseid'}.'" />'."\n";
-            }
-            if ($env{'form.type'}) {
-                my $usertype = &get_usertype($domain);
-                if ($usertype ne '') {
-                    $msg .= '<input type="hidden" name="type" value="'.$usertype.'" />'.
-                            '<input type="hidden" name="reportedtype" value="'.&mt('Submit').'" />'."\n";
-                }
-            }
-            $msg .= '</form></p>';
-            return $msg;
-        }
-        my $ip = &Apache::lonnet::get_requestor_ip();
-        my %info = ('ip'         => $ip,
+        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $email,
@@ -1076,7 +940,7 @@ sub process_mailtoken {
                                     $data{'inststatus'} = $usertype;
                                 }
                             } else {
-                                $disposition = 'approval';
+                                undef($usertype);
                             }
                         }
                         delete($data{'usertype'});
@@ -1084,12 +948,7 @@ sub process_mailtoken {
                     if (ref($settings) eq 'HASH') {
                         if (ref($settings->{'cancreate'}) eq 'HASH') {
                             if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
-                                if ($usertype ne '') {
-                                    $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype};
-                                    unless ($disposition =~ /^(approval|automatic)$/) {
-                                        $disposition = 'approval';
-                                    }
-                                }
+                                $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype}; 
                             }
                         }
                     }
@@ -1101,9 +960,8 @@ sub process_mailtoken {
                             &create_account($r,$domain,$domdesc,\%data);
                         if ($result eq 'ok') {
                             $msg = $output;
-                            my $ip = &Apache::lonnet::get_requestor_ip();
                             my $shownow = &Apache::lonlocal::locallocaltime($now);
-                            my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ip,$contact_name,$contact_email)."\n";
+                            my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
                             my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                         $mailmsg,$contact_name,
                                                                         $contact_email);
@@ -1169,68 +1027,56 @@ sub start_session {
 #
 sub print_dataentry_form {
     my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha,
-        $usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_;
+        $usertype,$recaptchaversion,$usernameset,$condition) = @_;
     my ($error,$output);
-    if (open(my $jsh,"<","$include/londes.js")) {
+    if (open(my $jsh,"<$include/londes.js")) {
         while(my $line = <$jsh>) {
             $r->print($line);
         }
         close($jsh);
         $output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion,
-                                       $usernameset,$condition,$excluded).
-                  "\n".&javascript_checkpass($now,'email',$domain);
+                                       $usernameset,$condition).
+                  "\n".&javascript_checkpass($now,'email');
         my ($lkey,$ukey) = &Apache::loncommon::des_keys();
         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"; 
+        if ($usernameset) {
+            $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="" />
@@ -1242,33 +1088,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);
         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>');
     }
@@ -1282,7 +1120,7 @@ ENDSERVERFORM
 sub get_creation_controls {
     my ($domain,$usercreation) = @_;
     my (@cancreate,@statustocreate,@statusforemail,$emailusername,$processing,
-        $emailoptions,$verification,$emaildomain,$othertitle,$usertypes,$types);
+        $verification,$emaildomain,$othertitle,$usertypes,$types);
     if (ref($usercreation) eq 'HASH') {
         if (ref($usercreation->{'cancreate'}) eq 'HASH') {
             ($othertitle,$usertypes,$types) =
@@ -1314,9 +1152,6 @@ sub get_creation_controls {
                 if (ref($usercreation->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
                     $processing = $usercreation->{'cancreate'}{'selfcreateprocessing'};
                 }
-                if (ref($usercreation->{'cancreate'}{'emailoptions'}) eq 'HASH') {
-                    $emailoptions = $usercreation->{'cancreate'}{'emailoptions'};
-                }
                 if (ref($usercreation->{'cancreate'}{'emailverified'}) eq 'HASH') {
                     $verification = $usercreation->{'cancreate'}{'emailverified'};
                 }
@@ -1327,15 +1162,27 @@ sub get_creation_controls {
                     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
                     my @emailtypes;
                     if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
-                        @statusforemail = @{$domdefaults{'inststatusguest'}};
-                        unless (@statusforemail) {
-                            my @okcreate;
-                            foreach my $poss (@cancreate) {
-                                unless ($poss eq 'email') {
-                                     push(@okcreate,$poss);
+                        @emailtypes = @{$domdefaults{'inststatusguest'}};
+                        if (@emailtypes) {
+                            unless (grep(/^default$/,@emailtypes)) {
+                                push(@emailtypes,'default');
+                            }
+                            foreach my $type (@emailtypes) {
+                                if ($processing->{$type} ne 'notinuse') {
+                                    unless (grep(/^$type$/,@statusforemail)) {
+                                        push(@statusforemail,$type);
+                                    }
+                                }
+                            }
+                            unless (@statusforemail) {
+                                my @okcreate;
+                                foreach my $poss (@cancreate) {
+                                    unless ($poss eq 'email') {
+                                        push(@okcreate,$poss);
+                                    }
                                 }
+                                @cancreate = @okcreate;
                             }
-                            @cancreate = @okcreate;
                         }
                     }
                 }  
@@ -1353,7 +1200,7 @@ sub get_creation_controls {
         }
     }
     return (\@cancreate,\@statustocreate,\@statusforemail,$emailusername,
-            $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle);
+            $verification,$emaildomain,$types,$usertypes,$othertitle);
 }
 
 sub create_account {
@@ -1393,13 +1240,7 @@ sub create_account {
 
         my ($key,$caller)=split(/&/,$dataref->{'tmpinfo'});
         if ($caller eq 'createaccount') {
-            my $upass;
-            if ($encpass eq '') {
-                $output = &mt('Password retrieved was blank.');
-                return ('fail',$error.$output.$end.$rtnlink);
-            } else {
-                $upass = &Apache::loncommon::des_decrypt($key,$encpass);
-            }
+            my $upass = &Apache::loncommon::des_decrypt($key,$encpass);
 
 # See if we are allowed to use the proposed student/employee ID,
 # as per domain rules; if not, student/employee will be left blank.
@@ -1429,7 +1270,7 @@ sub create_account {
             unless (($inststatus eq 'default') || ($inststatus eq '')) {
                 &Apache::lonnet::put('environment',{inststatus => $inststatus},$domain,$username);
             }
-            $output .= '<br />'.&mt('Home Server').": $uhome ".
+            $output .= '<br />'.&mt('Home server: [_1]',$uhome).' '.
                        &Apache::lonnet::hostname($uhome).'<br /><br />';
             return ('ok',$output,$uhome);
         } else {
@@ -1602,8 +1443,7 @@ sub username_check {
                     '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
                     '<input type="hidden" name="phase" value="username_activation" />';
         my $now = time;
-        my $ip = &Apache::lonnet::get_requestor_ip();
-        my %info = ('ip'         => $ip,
+        my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                     'time'       => $now,
                     'domain'     => $domain,
                     'username'   => $username);
@@ -1807,6 +1647,8 @@ sub invalid_state {
         $msg .= &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.');
     } elsif ($error eq 'userformat') {
         $msg .= &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
+    } elsif ($error eq 'captcha') {
+        $msg .= &mt('Validation of the code you entered failed.');
     } elsif ($error eq 'noemails') {
         $msg .= &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
     } elsif ($error eq 'emailfail') {
@@ -1943,15 +1785,11 @@ sub store_request {
 }
 
 sub guest_format_check {
-    my ($useremail,$domain,$cancreate,$settings,$usertype) = @_;
+    my ($useremail,$domain,$cancreate,$settings) = @_;
     my ($login,$format_match,$format_msg,@user_rules);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'email_rule'}) eq 'ARRAY') {
             push(@user_rules,@{$settings->{'email_rule'}});
-        } elsif (ref($settings->{'email_rule'}) eq 'HASH') {
-            if (ref($settings->{'email_rule'}->{$usertype}) eq 'ARRAY') {
-                push(@user_rules,@{$settings->{'email_rule'}->{$usertype}});
-            }
         }
     }
     if (@user_rules > 0) {
@@ -1987,14 +1825,14 @@ sub sso_logout_frag {
     if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
         my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
         if (-e $msgfile) {
-            open(my $fh,"<",$msgfile);
+            open(my $fh,"<$msgfile");
             $endsessionmsg = join('',<$fh>);
             close($fh);
         }
     } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
         my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
         if (-e $msgfile) {     
-            open(my $fh,"<",$msgfile);
+            open(my $fh,"<$msgfile");
             $endsessionmsg = join('',<$fh>);
             close($fh);
         }
@@ -2113,7 +1951,6 @@ function checkVerification() {
             if (curr == types[j]) {
                 if (!cancreate) {
                     alert('Creation of an account via verification by e-mail unavailable for user type: "'+names[j]+'"');
-                    setElements();
                 }
                 break;
             }
@@ -2137,7 +1974,7 @@ sub username_js {
 <script type="text/javascript">
 // <![CDATA[
 
-function toggleUsernameDisp(caller,divid) {
+function toggleDisplay(caller,divid) {
     if (document.getElementById(divid)) {
         if (caller.checked) {
             if (caller.value == '1') {