--- loncom/interface/createaccount.pm	2017/07/26 19:45:45	1.73
+++ loncom/interface/createaccount.pm	2017/08/03 16:22:08	1.74
@@ -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.73 2017/07/26 19:45:45 raeburn Exp $
+# $Id: createaccount.pm,v 1.74 2017/08/03 16:22:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,7 +150,7 @@ sub handler {
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     my ($cancreate,$statustocreate,$statusforemail,$emailusername,
-        $verification,$emaildomain,$types,$usertypes,$othertitle) =
+        $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle) =
         &get_creation_controls($domain,$domconfig{'usercreation'});
     my ($additems,$pagetitle);
     if (ref($cancreate) eq 'ARRAY') {
@@ -158,14 +158,15 @@ sub handler {
                 ($env{'form.create_with_email'})) {
             if ((grep(/^email$/,@{$cancreate})) && (ref($statusforemail) eq 'ARRAY')) {
                 my $usertype = &get_usertype($domain);
-                if (($usertype ne '') && (grep(/^\Q$usertype\E$/,@{$statusforemail}))) {
-                    $js .= &username_js();
-                } elsif (($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) {
+                if ((($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) && 
+                    (@{$statusforemail} > 0)) {
                     $js .= &setelements_js($statusforemail,$types,$usertypes,$othertitle);
                     $additems = {'add_entries' => { 'onload' => "setElements();"} };
-                    if (@{$cancreate} == 1) {
+                    if ((@{$cancreate} == 1) && (@{$statusforemail} > 0)) {
                         $pagetitle = 'Select affiliation';
                     }
+                } else {
+                    $js .= &username_js();
                 }
             }
         }
@@ -255,18 +256,32 @@ sub handler {
             return OK;
         }
     }
-    my ($usernameset,$condition);
+    my ($usernameset,$condition,$excluded,$hascustom);
     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} eq 'other') {
-                $usernameset = 1;
+            if ($verification->{$usertype} =~ /^(free|first)$/) {
+                $usernameset = $verification->{$usertype};
+            }
+        }
+        if (ref($emailoptions) eq 'HASH') {
+            if ($emailoptions->{$usertype} =~ /^(inst|noninst)$/) {
+                my $chosen = $1;
                 if (ref($emaildomain) eq 'HASH') {
-                    if ($emaildomain->{$usertype} ne '') {
-                        $condition = $emaildomain->{$usertype};
+                    if (ref($emaildomain->{$usertype}) eq 'HASH') {
+                        if ($chosen eq 'inst') {
+                            $condition = $emaildomain->{$usertype}->{$chosen};
+                        } else {
+                            $excluded = $emaildomain->{$usertype}->{$chosen};
+                        }
                     }
                 }
+            } elsif ($emailoptions->{$usertype} eq 'custom') {
+                $hascustom = 1;
             }
         }
     }
@@ -301,11 +316,14 @@ 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);
+                                         $usernameset,$condition,$excluded,$hascustom);
     } elsif (!$token) {
         &print_header($r,$start_page,$courseid,$pagetitle);
         my $now=time;
@@ -319,13 +337,13 @@ sub handler {
             }
         }
         if (grep(/^email$/,@{$cancreate})) {
-            $r->print(&javascript_validmail());
+            $r->print(&javascript_validmail($condition));
         }
         my $usertype = &get_usertype($domain);
         $output = &print_username_form($r,$domain,$domdesc,$cancreate,$now,$lonhost,
                                        $include,$courseid,$emailusername,
                                        $statusforemail,$usernameset,$condition,
-                                       $usertype,$types,$usertypes,$othertitle);
+                                       $excluded,$usertype,$types,$usertypes,$othertitle);
     }
     $r->print($output);
     &print_footer($r);
@@ -409,7 +427,7 @@ sub selfenroll_crumbs {
 }
 
 sub javascript_setforms {
-    my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition) =  @_;
+    my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition,$excluded) =  @_;
     my ($setuserinfo,@required,$requiredchk);
     if (ref($emailusername) eq 'HASH') {
         if (ref($emailusername->{$usertype}) eq 'HASH') {  
@@ -431,7 +449,7 @@ sub javascript_setforms {
                 '                    server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n";
             }
         }
-        if ($usernameset) {
+        if ($usernameset eq 'free') {
             $setuserinfo .=
                 '                    server.elements.username.value=client.elements.username.value;'."\n";
         }
@@ -478,10 +496,8 @@ $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') {
@@ -543,9 +559,12 @@ 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',
+               isco  => 'is combined with the required domain',
     );
     my $output =  "\n".'<script type="text/javascript">'."\n".
                   '// <![CDATA['."\n".
@@ -554,8 +573,13 @@ sub javascript_validmail {
     $output .= <<"ENDSCRIPT";
 function validate_email(client) {
     field = client.uname;
-    if (validmail(field) == false) {
-        alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
+    var condition = '$condition';
+    if (validmail(field,condition) == false) {
+        if ((condition != undefined) && (condition != '')) {
+            alert("$js_lt{'avae'}: "+field.value+" $js_lt{'isco'}: "+condition);
+        } else {
+            alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}.");
+        }
         return false;
     }
     return true;
@@ -567,7 +591,7 @@ ENDSCRIPT
 
 sub print_username_form {
     my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername,
-        $statusforemail,$usernameset,$condition,$usertype,$types,$usertypes,
+        $statusforemail,$usernameset,$condition,$excluded,$usertype,$types,$usertypes,
         $othertitle) = @_;
     my %lt = &Apache::lonlocal::texthash (
                                          crac => 'Create account with a username provided by this institution',
@@ -595,14 +619,16 @@ 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') {
+                if ((ref($statusforemail) eq 'ARRAY') && (@{$statusforemail} > 0)) {
                     unless (grep(/^\Q$usertype\E$/,@{$statusforemail})) {
                         undef($usertype);
                     }
+                } elsif ($usertype ne 'default') {
+                    undef($usertype);
                 }
             }
             if (($usertype eq '') && (ref($statusforemail) eq 'ARRAY') && 
-                (@{$statusforemail}) && (ref($types) eq 'ARRAY')) {
+                (@{$statusforemail} > 0) && (ref($types) eq 'ARRAY') && (@{$types} > 0)) {
                 my @posstypes = @{$types};
                 unless (grep(/^default$/,@posstypes)) {
                     push(@posstypes,'default');
@@ -659,9 +685,12 @@ sub print_username_form {
                         $output .= $prompt.'<br />'.
                                    $lt{'yopw'}.'<br />';
                     }
+                    if ($usertype eq '') {
+                        $usertype = 'default';
+                    }
                     $output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform,
                                                      $courseid,$emailusername,$captcha,$usertype,
-                                                     $recaptchaversion,$usernameset,$condition);
+                                                     $recaptchaversion,$usernameset,$condition,$excluded);
                 }
             }
             $output .= '</div>';
@@ -729,42 +758,52 @@ sub login_box {
 sub process_email_request {
     my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
         $server,$settings,$emailusername,$courseid,$usertype,$usernameset,
-        $condition) = @_;
+        $condition,$excluded,$hascustom) = @_;
     my ($output,$uname);
     if (ref($cancreate) eq 'ARRAY') {
         if (!grep(/^email$/,@{$cancreate})) {
             $output = &invalid_state('noemails',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
-        } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
+        } elsif ((($condition ne '') && ($useremail !~ /^[^\@]+$/)) ||
+                 (($condition eq '') && ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) {
             $output = &invalid_state('baduseremail',$domdesc,
                                      $contact_name,$contact_email);
             return $output;
         } else {
             $useremail =~ s/^\s+|\s+$//g;
             my $possuname;
-            if ($env{'form.username'}) {
+            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 '')) {
                 $possuname = $env{'form.username'};
-                $possuname  =~ s/^\s+|\s+$//g;
+            } elsif (($usernameset eq 'first') && ($condition eq '')) {
+                if ($condition eq '') {
+                    ($possuname) = ($useremail =~ /^([^\@]+)\@/);
+                }
             }
-            if (($usernameset) && ($possuname ne '')) {
-                if ($condition ne '') {
-                    if ($useremail =~ /\Q$condition\E/) {
-                        $uname = &LONCAPA::clean_username($possuname);
-                    } else {
-                        $output = &invalid_state('emailfail',$domdesc,
+            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,
                                                  $contact_name,$contact_email);
                         return $output;
                     }
-                } else {
-                    $uname=&LONCAPA::clean_username($possuname);
                 }
-                if ($uname ne $possuname) {
-                    $output = &invalid_state('badusername',$domdesc,
-                                             $contact_name,$contact_email);
-                    return $output;
-                }
-            } else {
+            }
+            if ($possuname eq '') {
                 $uname=&LONCAPA::clean_username($useremail);
                 if ($useremail ne $uname) {
                     $output = &invalid_state('badusername',$domdesc,
@@ -796,10 +835,10 @@ sub process_email_request {
                         }
                     }
                 }
-                if (($usernameset) && ($possuname ne '')) {
+                if ($hascustom) {
                     my $format_msg = 
                         &guest_format_check($useremail,$domain,$cancreate,
-                                            $settings);
+                                            $settings,$usertype);
                     if ($format_msg) {
                         $output = &invalid_state('userformat',$domdesc,$contact_name,
                                                  $contact_email,$format_msg);
@@ -940,7 +979,7 @@ sub process_mailtoken {
                                     $data{'inststatus'} = $usertype;
                                 }
                             } else {
-                                undef($usertype);
+                                $disposition = 'approval';
                             }
                         }
                         delete($data{'usertype'});
@@ -948,7 +987,12 @@ sub process_mailtoken {
                     if (ref($settings) eq 'HASH') {
                         if (ref($settings->{'cancreate'}) eq 'HASH') {
                             if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
-                                $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype}; 
+                                if ($usertype ne '') {
+                                    $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype};
+                                    unless ($disposition =~ /^(approval|automatic)$/) {
+                                        $disposition = 'approval';
+                                    }
+                                }
                             }
                         }
                     }
@@ -1027,7 +1071,7 @@ sub start_session {
 #
 sub print_dataentry_form {
     my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha,
-        $usertype,$recaptchaversion,$usernameset,$condition) = @_;
+        $usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_;
     my ($error,$output);
     if (open(my $jsh,"<$include/londes.js")) {
         while(my $line = <$jsh>) {
@@ -1035,7 +1079,7 @@ sub print_dataentry_form {
         }
         close($jsh);
         $output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion,
-                                       $usernameset,$condition).
+                                       $usernameset,$condition,$excluded).
                   "\n".&javascript_checkpass($now,'email');
         my ($lkey,$ukey) = &Apache::loncommon::des_keys();
         my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
@@ -1073,7 +1117,7 @@ sub print_dataentry_form {
             $output .= '<input type="hidden" name="type" value="'.
                        &HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n";
         }
-        if ($usernameset) {
+        if ($usernameset eq 'free') {
             $output .= '<input type="hidden" name="username" value="" />'."\n"; 
         }
         $output .= <<"ENDSERVERFORM";
@@ -1097,7 +1141,7 @@ ENDSERVERFORM
             &Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate',
                                                           '','',$now,$captchaform,
                                                           $emailusername,$usertype,
-                                                          $usernameset,$condition);
+                                                          $usernameset,$condition,$excluded);
         if ($rowcount) {
             $output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform;
         } else {
@@ -1120,7 +1164,7 @@ ENDSERVERFORM
 sub get_creation_controls {
     my ($domain,$usercreation) = @_;
     my (@cancreate,@statustocreate,@statusforemail,$emailusername,$processing,
-        $verification,$emaildomain,$othertitle,$usertypes,$types);
+        $emailoptions,$verification,$emaildomain,$othertitle,$usertypes,$types);
     if (ref($usercreation) eq 'HASH') {
         if (ref($usercreation->{'cancreate'}) eq 'HASH') {
             ($othertitle,$usertypes,$types) =
@@ -1152,6 +1196,9 @@ 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'};
                 }
@@ -1162,27 +1209,15 @@ sub get_creation_controls {
                     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
                     my @emailtypes;
                     if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
-                        @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);
-                                    }
+                        @statusforemail = @{$domdefaults{'inststatusguest'}};
+                        unless (@statusforemail) {
+                            my @okcreate;
+                            foreach my $poss (@cancreate) {
+                                unless ($poss eq 'email') {
+                                     push(@okcreate,$poss);
                                 }
-                                @cancreate = @okcreate;
                             }
+                            @cancreate = @okcreate;
                         }
                     }
                 }  
@@ -1200,7 +1235,7 @@ sub get_creation_controls {
         }
     }
     return (\@cancreate,\@statustocreate,\@statusforemail,$emailusername,
-            $verification,$emaildomain,$types,$usertypes,$othertitle);
+            $emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle);
 }
 
 sub create_account {
@@ -1240,7 +1275,13 @@ sub create_account {
 
         my ($key,$caller)=split(/&/,$dataref->{'tmpinfo'});
         if ($caller eq 'createaccount') {
-            my $upass = &Apache::loncommon::des_decrypt($key,$encpass);
+            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);
+            }
 
 # See if we are allowed to use the proposed student/employee ID,
 # as per domain rules; if not, student/employee will be left blank.
@@ -1785,11 +1826,15 @@ sub store_request {
 }
 
 sub guest_format_check {
-    my ($useremail,$domain,$cancreate,$settings) = @_;
+    my ($useremail,$domain,$cancreate,$settings,$usertype) = @_;
     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) {
@@ -1974,7 +2019,7 @@ sub username_js {
 <script type="text/javascript">
 // <![CDATA[
 
-function toggleDisplay(caller,divid) {
+function toggleUsernameDisp(caller,divid) {
     if (document.getElementById(divid)) {
         if (caller.checked) {
             if (caller.value == '1') {