--- loncom/interface/domainprefs.pm	2014/02/28 19:20:05	1.227
+++ loncom/interface/domainprefs.pm	2014/03/03 17:11:42	1.228
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.227 2014/02/28 19:20:05 bisitz Exp $
+# $Id: domainprefs.pm,v 1.228 2014/03/03 17:11:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3796,7 +3796,6 @@ sub print_selfcreation {
         }
     }
     my %radiohash;
-    my $rownum = 0;
     my $numinrow = 4;
     map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
     if ($position eq 'top') {
@@ -3809,18 +3808,18 @@ sub print_selfcreation {
                                'cancreate_login' => 'off',
                                'cancreate_sso'   => 'off',
                              );
-        my $itemcount = 1;
-        my $onclick;
+        my ($onclick,$itemcount);
         ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
                                                      \%choices,$itemcount,$onclick);
+        $$rowtotal += $itemcount;
+        
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
 
         if (ref($usertypes) eq 'HASH') {
             if (keys(%{$usertypes}) > 0) {
                 $datatable .= &insttypes_row($createsettings,$types,$usertypes,
                                              $dom,$numinrow,$othertitle,
-                                             'statustocreate',$rownum);
-                $rownum ++;
+                                             'statustocreate',$$rowtotal);
                 $$rowtotal ++;
             }
         }
@@ -3832,14 +3831,13 @@ sub print_selfcreation {
             push(@{$types},'default');
             $usertypes->{'default'} = $othertitle;
             foreach my $status (@{$types}) {
-                $rownum ++;
                 $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
-                                                       $numinrow,$rownum,$usertypes);
+                                                       $numinrow,$$rowtotal,$usertypes);
                 $$rowtotal ++;
             }
         }
     } else {
-        my $css_class = $rownum%2?' class="LC_odd_row"':'';
+        my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
         my %choices =
             &Apache::lonlocal::texthash(
                                           email         => 'Approved automatically',
@@ -3871,27 +3869,32 @@ sub print_selfcreation {
                           $choices{$option}.'</label>&nbsp;';
         }
         $$rowtotal ++;
-        $rownum ++;
         $datatable .= '</span></td></tr>'.
                       &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
-        $rownum ++;
-        my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-        $numinrow = 2;
-        $datatable .= &modifiable_userdata_row('cancreate','emailusername',$settings,
-                                               $numinrow,$rownum,undef,$infofields,$infotitles);
         $$rowtotal ++;
-        $rownum ++;
+        my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
+        $numinrow = 1;
+        my ($othertitle,$usertypes,$types) =  &Apache::loncommon::sorted_inst_types($dom);
+        $usertypes->{'default'} = $othertitle;
+        if (ref($types) eq 'ARRAY') {
+            push(@{$types},'default');
+            $usertypes->{'default'} = $othertitle;
+            foreach my $status (@{$types}) {
+                $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
+                                                       $numinrow,$$rowtotal,$usertypes,$infofields,$infotitles);
+                $$rowtotal ++;
+            }
+        }
         my ($emailrules,$emailruleorder) =
             &Apache::lonnet::inst_userrules($dom,'email');
         if (ref($emailrules) eq 'HASH') {
             if (keys(%{$emailrules}) > 0) {
                 $datatable .= &user_formats_row('email',$settings,$emailrules,
-                                                $emailruleorder,$numinrow,$rownum);
-                $rownum ++;
+                                                $emailruleorder,$numinrow,$$rowtotal);
                 $$rowtotal ++;
             }
         }
-        $datatable .= &captcha_choice('cancreate',$createsettings,$rownum);
+        $datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal);
     }
     return $datatable;
 }
@@ -4857,11 +4860,20 @@ sub build_category_rows {
 }
 
 sub modifiable_userdata_row {
-    my ($context,$role,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref) = @_;
-    my $rolename;
+    my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref) = @_;
+    my ($role,$rolename,$statustype);
+    $role = $item;
     if ($context eq 'cancreate') {
-        if ($role eq 'emailusername') {
-            $rolename = &mt('Data user provides');
+        if ($item =~ /^emailusername_(.+)$/) {
+            $statustype = $1;
+            $role = 'emailusername';
+            if (ref($usertypes) eq 'HASH') {
+                if ($usertypes->{$statustype}) {
+                    $rolename = &mt('Data provided by [_1]',$usertypes->{$statustype});
+                } else {
+                    $rolename = &mt('Data provided by user');
+                }
+            }
         }
     } elsif ($context eq 'selfcreate') {
         if (ref($usertypes) eq 'HASH') {
@@ -4898,14 +4910,33 @@ sub modifiable_userdata_row {
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$context}) eq 'HASH') {
             if (ref($settings->{$context}->{$role}) eq 'HASH') {
-                foreach my $field (@fields) {
-                    if ($settings->{$context}->{$role}->{$field}) {
-                        $checks{$field} = ' checked="checked" ';
+                my $hashref = $settings->{$context}->{$role};
+                if ($role eq 'emailusername') {
+                    if ($statustype) {
+                        if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
+                            $hashref = $settings->{$context}->{$role}->{$statustype};
+                            if (ref($hashref) eq 'HASH') { 
+                                foreach my $field (@fields) {
+                                    if ($hashref->{$field}) {
+                                        $checks{$field} = $hashref->{$field};
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    if (ref($hashref) eq 'HASH') {
+                        foreach my $field (@fields) {
+                            if ($hashref->{$field}) {
+                                $checks{$field} = ' checked="checked" ';
+                            }
+                        }
                     }
                 }
             }
         }
     }
+     
     for (my $i=0; $i<@fields; $i++) {
         my $rem = $i%($numinrow);
         if ($rem == 0) {
@@ -4915,20 +4946,40 @@ sub modifiable_userdata_row {
             $output .= '<tr>';
         }
         my $check = ' ';
-        if (exists($checks{$fields[$i]})) {
-            $check = $checks{$fields[$i]}
-        } else {
-            if ($role eq 'st') {
-                if (ref($settings) ne 'HASH') {
-                    $check = ' checked="checked" '; 
+        unless ($role eq 'emailusername') {
+            if (exists($checks{$fields[$i]})) {
+                $check = $checks{$fields[$i]}
+            } else {
+                if ($role eq 'st') {
+                    if (ref($settings) ne 'HASH') {
+                        $check = ' checked="checked" '; 
+                    }
                 }
             }
         }
         $output .= '<td class="LC_left_item">'.
-                   '<span class="LC_nobreak"><label>'.
-                   '<input type="checkbox" name="canmodify_'.$role.'" '.
-                   'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
-                   '</label></span></td>';
+                   '<span class="LC_nobreak">';
+        if ($role eq 'emailusername') {
+            unless ($checks{$fields[$i]} =~ /^(required|optional)$/) {
+                $checks{$fields[$i]} = 'omit';
+            }
+            foreach my $option ('required','optional','omit') {
+                my $checked='';
+                if ($checks{$fields[$i]} eq $option) {
+                    $checked='checked="checked" ';
+                }
+                $output .= '<label>'.
+                           '<input type="radio" name="canmodify_'.$item.'_'.$fields[$i].'" value="'.$option.'" '.$checked.'/>'.
+                           &mt($option).'</label>'.('&nbsp;' x2);
+            }
+            $output .= '<i>'.$fieldtitles{$fields[$i]}.'</i>';
+        } else {
+            $output .= '<label>'.
+                       '<input type="checkbox" name="canmodify_'.$role.'" '.
+                       'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
+                       '</label>';
+        }
+        $output .= '</span></td>';
         $rem = @fields%($numinrow);
     }
     my $colsleft = $numinrow - $rem;
@@ -7661,6 +7712,11 @@ sub modify_selfcreation {
     my ($dom,%domconfig) = @_;
     my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%changes,%cancreate);
     my (%save_usercreate,%save_usermodify);
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+    if (ref($types) eq 'ARRAY') {
+        $usertypes->{'default'} = $othertitle;
+        push(@{$types},'default');
+    }
 #
 # Retrieve current domain configuration for self-creation of usernames from $domconfig{'usercreation'}.
 #
@@ -7712,7 +7768,7 @@ sub modify_selfcreation {
 # Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
 # is permitted.
 #
-    foreach my $item ('login','sso','email') { 
+    foreach my $item ('login','sso','email') {
         if ($item eq 'email') {
             if ($env{'form.cancreate_email'} eq 'email') {
                 push(@{$cancreate{'selfcreate'}},'email');
@@ -7728,20 +7784,22 @@ sub modify_selfcreation {
     my (@email_rule,%userinfo,%savecaptcha);
     my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
 #
-# Populate $cancreate{'emailusername'} hash ref with information types (if new user will provide data
-# value set to one), if self-creation with e-mail address permitted.
+# Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data
+# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc.
 #
     if (($env{'form.cancreate_email'} eq 'email') || ($env{'form.cancreate_email'} eq 'emailapproval')) {
-        push(@contexts,'emailusername'); 
-        map { $userinfo{$_} = 1; } &Apache::loncommon::get_env_multiple('form.canmodify_emailusername');
-        if (ref($infofields) eq 'ARRAY') {
-            foreach my $field (@{$infofields}) {
-                if ($userinfo{$field}) {
-                    $cancreate{'emailusername'}{$field} = 1;
+        push(@contexts,'emailusername');
+        if (ref($types) eq 'ARRAY') {
+            foreach my $type (@{$types}) {
+                if (ref($infofields) eq 'ARRAY') {
+                    foreach my $field (@{$infofields}) {
+                        if ($env{'form.canmodify_emailusername_'.$type.'_'.$field} =~ /^(required|optional)$/) {
+                            $cancreate{'emailusername'}{$type}{$field} = $1;
+                        }
+                    }
                 }
             }
         }
-
 #
 # Populate $cancreate{'notify'} hash ref with names of Domain Coordinators who are to be notified of
 # queued requests for self-creation of account using e-mail address as username
@@ -7800,7 +7858,6 @@ sub modify_selfcreation {
                           &mt('You need to set the default authentication type to Kerberos 4 or 5 (with a Kerberos domain specified), or to Local authentication, if the localauth module has been customized in your domain to authenticate institutional logins.');
         }
     }
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
@@ -7813,14 +7870,12 @@ sub modify_selfcreation {
 #
     if (($env{'form.cancreate_login'}) || ($env{'form.cancreate_sso'})) {
         if (ref($types) eq 'ARRAY') {
-            if (@{$types} > 0) {
+            if (@{$types} > 1) {
                 @{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate');
                 push(@contexts,'statustocreate');
             } else {
                 undef($cancreate{'statustocreate'});
             } 
-            push(@{$types},'default');
-            $usertypes->{'default'} = $othertitle;
             foreach my $type (@{$types}) {
                 my @modifiable =  &Apache::loncommon::get_env_multiple('form.canmodify_'.$type);
                 foreach my $field (@fields) {
@@ -7873,16 +7928,42 @@ sub modify_selfcreation {
         } elsif (ref($curr_usercreation{'cancreate'}{$item}) eq 'HASH') {
             if (ref($cancreate{$item}) eq 'HASH') {
                 foreach my $curr (keys(%{$curr_usercreation{'cancreate'}{$item}})) {
-                    if (!$cancreate{$item}{$curr}) {
-                        if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                            push(@{$changes{'cancreate'}},$item);
+                    if (ref($curr_usercreation{'cancreate'}{$item}{$curr}) eq 'HASH') {
+                        foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$curr}})) {
+                            unless ($curr_usercreation{'cancreate'}{$item}{$curr}{$field} eq $cancreate{$item}{$curr}{$field}) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        }
+                    } else {
+                        if (!$cancreate{$item}{$curr}) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
                         }
                     }
                 }
                 foreach my $field (keys(%{$cancreate{$item}})) {
-                    if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
-                        if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                            push(@{$changes{'cancreate'}},$item);
+                    if (ref($cancreate{$item}{$field}) eq 'HASH') {
+                        foreach my $inner (keys(%{$cancreate{$item}{$field}})) {
+                            if (ref($curr_usercreation{'cancreate'}{$item}{$field}) eq 'HASH') {
+                                unless ($curr_usercreation{'cancreate'}{$item}{$field}{$inner} eq $cancreate{$item}{$field}{$inner}) {
+                                    if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                        push(@{$changes{'cancreate'}},$item);
+                                    }
+                                }
+                            } else {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        }
+                    } else {
+                        if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
                         }
                     }
                 }
@@ -7902,8 +7983,19 @@ sub modify_selfcreation {
                 }
             }
         } elsif ($item eq 'emailusername') {
-            if (keys(%userinfo) > 0) {
-                push(@{$changes{'cancreate'}},$item);
+            if (ref($cancreate{$item}) eq 'HASH') {
+                foreach my $type (keys(%{$cancreate{$item}})) {
+                    if (ref($cancreate{$item}{$type}) eq 'HASH') {
+                        foreach my $field (keys(%{$cancreate{$item}{$type}})) {
+                            if ($cancreate{$item}{$type}{$field}) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                                last;
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -8033,17 +8125,23 @@ sub modify_selfcreation {
                         $chgtext .= '</ul>';
                     } elsif ($type eq 'emailusername') {
                         if (ref($cancreate{'emailusername'}) eq 'HASH') {
-                            if (keys(%{$cancreate{'emailusername'}}) > 0) {
-                                $chgtext .= &mt('When self-creating account with e-mail as username, user will provide the following information:').
-                                            '<ul>';
-                                foreach my $field (@{$infofields}) {
-                                    if ($cancreate{'emailusername'}{$field}) {
-                                        $chgtext .= '<li>'.$infotitles->{$field}.'</li>';
+                            if (ref($types) eq 'ARRAY') {
+                                foreach my $type (@{$types}) {
+                                    if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') {
+                                        if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) {
+                                            $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',$usertypes->{$type}).
+                                                    '<ul>';
+                                            foreach my $field (@{$infofields}) {
+                                                if ($cancreate{'emailusername'}{$type}{$field}) {
+                                                    $chgtext .= '<li>'.$infotitles->{$field}.'</li>';
+                                                }
+                                            }
+                                        }
+                                        $chgtext .= '</ul>';
+                                    } else {
+                                        $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',$usertypes->{$type}).'<br />';
                                     }
                                 }
-                                $chgtext .= '</ul>';
-                            } else {
-                                $chgtext .= &mt('When self creating account with e-mail as username, user will not provide any information besides e-mail address');
                             }
                         }
                     } elsif ($type eq 'notify') {