--- loncom/interface/loncreateuser.pm	2014/02/28 19:20:06	1.395
+++ loncom/interface/loncreateuser.pm	2014/03/03 17:11:41	1.396
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.395 2014/02/28 19:20:06 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.396 2014/03/03 17:11:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2164,7 +2164,7 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername) = @_;
+        $now,$captchaform,$emailusername,$usertype) = @_;
     my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
@@ -2206,19 +2206,24 @@ sub personal_data_display {
                                                        \@userinfo,$rolesarray);
     } elsif ($context eq 'selfcreate') {
         if ($newuser eq 'email') {
-            if (ref($emailusername) eq 'HASH') { 
-                my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-                @userinfo = ();          
-                if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
-                    foreach my $field (@{$infofields}) { 
-                        if ($emailusername->{$field}) {
-                            push(@userinfo,$field);
-                            $canmodify{$field} = 1;
-                            unless ($textboxsize{$field}) {
-                                $textboxsize{$field} = 25;
-                            }
-                            unless ($lt{$field}) {
-                                $lt{$field} = $infotitles->{$field};
+            if (ref($emailusername) eq 'HASH') {
+                if (ref($emailusername->{$usertype}) eq 'HASH') {
+                    my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
+                    @userinfo = ();          
+                    if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
+                        foreach my $field (@{$infofields}) { 
+                            if ($emailusername->{$usertype}->{$field}) {
+                                push(@userinfo,$field);
+                                $canmodify{$field} = 1;
+                                unless ($textboxsize{$field}) {
+                                    $textboxsize{$field} = 25;
+                                }
+                                unless ($lt{$field}) {
+                                    $lt{$field} = $infotitles->{$field};
+                                }
+                                if ($emailusername->{$usertype}->{$field} eq 'required') {
+                                    $lt{$field} .= '<b>*</b>';
+                                }
                             }
                         }
                     }
@@ -2234,19 +2239,19 @@ sub personal_data_display {
     $output = '<h3>'.$lt{'pd'}.'</h3>'.
               &Apache::lonhtmlcommon::start_pick_box();
     if (($context eq 'selfcreate') && ($newuser eq 'email')) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'email'},undef,
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
                                                      'LC_oddrow_value')."\n".
                    '<input type="text" name="uname" size="25" value="" autocomplete="off" />';
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
         my $upassone = '<input type="password" name="upass'.$now.'" size="10" autocomplete="off" />';
         my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" autocomplete="off" />';
-        $output .= &Apache::lonhtmlcommon::row_title(&mt('Password'),
+        $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>',
                                                     'LC_pick_box_title',
                                                     'LC_oddrow_value')."\n".
                    $upassone."\n".
                    &Apache::lonhtmlcommon::row_closure(1)."\n".
-                   &Apache::lonhtmlcommon::row_title(&mt('Confirm password'),
+                   &Apache::lonhtmlcommon::row_title(&mt('Confirm password').'<b>*</b>',
                                                      'LC_pick_box_title',
                                                      'LC_oddrow_value')."\n".
                    $upasstwo.
@@ -2360,6 +2365,7 @@ sub personal_data_display {
         $output .= &Apache::lonhtmlcommon::row_title()."\n".
                    '<br /><input type="submit" name="createaccount" value="'.
                    $submit_text.'" />'.
+                   '<input type="hidden" name="type" value="'.$usertype.'" />'.
                    &Apache::lonhtmlcommon::row_closure(1);
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
@@ -4816,26 +4822,47 @@ sub handler {
             if (ref($domconfig{'usercreation'}) eq 'HASH') {
                 if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
                     if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}) eq 'HASH') {
-                        my $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}}));
                         my %info =
                             &Apache::lonnet::get('nohist_requestedusernames',[$uname],$dom,$domconfiguser);
                         if (ref($info{$uname}) eq 'HASH') {
-                            if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
-                                $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
-                                my $num;
-                                foreach my $field (@{$infofields}) {
-                                    next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$field});
-                                    next unless ($infotitles->{$field});
-                                    $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
-                                              $info{$uname}{$field});
-                                    $num ++;
-                                    if ($count == $num) {
-                                        $r->print(&Apache::lonhtmlcommon::row_closure(1));
-                                    } else {
-                                        $r->print(&Apache::lonhtmlcommon::row_closure());
+                            my $usertype = $info{$uname}{'inststatus'};
+                            unless ($usertype) {
+                                $usertype = 'default';
+                            }
+                            if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
+                                if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
+                                    $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
+                                    my ($num,$count,$showstatus);
+                                    $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
+                                    unless ($usertype eq 'default') {
+                                        my ($othertitle,$usertypes,$types) = 
+                                            &Apache::loncommon::sorted_inst_types($dom);
+                                        if (ref($usertypes) eq 'HASH') {
+                                            if ($usertypes->{$usertype}) {
+                                                $showstatus = $usertypes->{$usertype};
+                                                $count ++;
+                                            }
+                                        }
+                                    }
+                                    foreach my $field (@{$infofields}) {
+                                        next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
+                                        next unless ($infotitles->{$field});
+                                        $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
+                                                  $info{$uname}{$field});
+                                        $num ++;
+                                        if ($count == $num) {
+                                            $r->print(&Apache::lonhtmlcommon::row_closure(1));
+                                        } else {
+                                            $r->print(&Apache::lonhtmlcommon::row_closure());
+                                        }
+                                    }
+                                    if ($showstatus) {
+                                        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
+                                                  $showstatus.
+                                                  &Apache::lonhtmlcommon::row_closure(1));
                                     }
+                                    $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
                                 }
-                                $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
                             }
                         }
                     }