--- loncom/interface/loncreateuser.pm	2008/03/12 02:45:06	1.238
+++ loncom/interface/loncreateuser.pm	2008/07/13 09:53:16	1.254
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.238 2008/03/12 02:45:06 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.254 2008/07/13 09:53:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1396,18 +1396,31 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    my ($ccuname,$ccdomain,$newuser,$context,$inst_results) = @_;
-    my ($output,$showforceid,%userenv,%canmodify);
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
+    my ($output,$showforceid,%userenv,%canmodify,@inststatuses);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
+    my $rowcount = 0;
+    my $editable = 0;
+    if ($context eq 'selfcreate') {
+        if (ref($inst_results) eq 'HASH') {
+            @inststatuses = &get_inststatuses($inst_results);
+            if (@inststatuses == 0) {
+                @inststatuses = ('default');
+            }
+            $rolesarray = \@inststatuses;
+        }
+    }
     if (!$newuser) {
         # Get the users information
         %userenv = &Apache::lonnet::get('environment',
                    ['firstname','middlename','lastname','generation',
                     'permanentemail','id'],$ccdomain,$ccuname);
+    }
+    if ((!$newuser) || ($context eq 'selfcreate')) {
         %canmodify =
             &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
-                                                       \@userinfo);
+                                                       \@userinfo,$rolesarray);
     }
     my %lt=&Apache::lonlocal::texthash(
                 'pd'             => "Personal Data",
@@ -1432,40 +1445,78 @@ sub personal_data_display {
               &Apache::lonhtmlcommon::start_pick_box();
     foreach my $item (@userinfo) {
         my $rowtitle = $lt{$item};
+        my $hiderow = 0;
         if ($item eq 'generation') {
             $rowtitle = $genhelp.$rowtitle;
         }
-        $output .= &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
+        my $row = &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
         if ($newuser) {
             if (ref($inst_results) eq 'HASH') {
                 if ($inst_results->{$item} ne '') {
-                    $output .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
+                    $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
                 } else {
-                    $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                    if ($context eq 'selfcreate') {
+                        if ($canmodify{$item}) { 
+                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                            $editable ++;
+                        } else {
+                            $hiderow = 1;
+                        }
+                    } else {
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                    }
                 }
             } else {
-                $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                if ($context eq 'selfcreate') {
+                    if ($canmodify{$item}) {
+                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                        $editable ++;
+                    } else {
+                        $hiderow = 1;
+                    }
+                } else {
+                    $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                }
             }
         } else {
             if ($canmodify{$item}) {
-                $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
+                $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
             } else {
-                $output .= $userenv{$item};
+                $row .= $userenv{$item};
             }
             if ($item eq 'id') {
                 $showforceid = $canmodify{$item};
             }
         }
-        $output .= &Apache::lonhtmlcommon::row_closure(1);
+        $row .= &Apache::lonhtmlcommon::row_closure(1);
+        if (!$hiderow) {
+            $output .= $row;
+            $rowcount ++;
+        }
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
     if (wantarray) {
-        return ($output,$showforceid);
+        if ($context eq 'selfcreate') {
+            return($output,$rowcount,$editable);
+        } else {
+            return ($output,$showforceid);
+        }
     } else {
         return $output;
     }
 }
 
+sub get_inststatuses {
+    my ($insthashref) = @_;
+    my @inststatuses = ();
+    if (ref($insthashref) eq 'HASH') {
+        if (ref($insthashref->{'inststatus'}) eq 'ARRAY') {
+            @inststatuses = @{$insthashref->{'inststatus'}};
+        }
+    }
+    return @inststatuses;
+}
+
 # ================================================================= Phase Three
 sub update_user_data {
     my ($r,$context) = @_; 
@@ -2041,13 +2092,14 @@ END
                       &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
         }
         $r->print($no_forceid_alert.
-                  &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts, \%curr_rules));
+                  &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts,\%curr_rules));
     }
     if ($env{'form.action'} eq 'singlestudent') {
-        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser);
-        $r->print('<p><a href="javascript:backPage(document.userupdate)">'.                  &mt('Enroll Another Student').'</a></p>');
+        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
+        $r->print('<p><a href="javascript:backPage(document.userupdate)">'.
+                  &mt('Enroll Another Student').'</a></p>');
     } else {
-        my @rolechanges = &update_roles($r);
+        my @rolechanges = &update_roles($r,$context);
         if ($namechanged) {
             if ($context eq 'course') {
                 if (@userroles > 0) {
@@ -2068,14 +2120,17 @@ END
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
         } else {
-            $r->print('<p><a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">'.&mt('Modify this user: <span class="LC_cusr_emph">([_1])</span>',$userinfo).'</a>'.('&nbsp;'x5).'<a href="javascript:backPage(document.userupdate)">'.&mt('Create/Modify Another User').'</a></p>');
+            $r->print('<p><a href="javascript:backPage(document.userupdate,'."'$env{'form.prevphase'}','modify'".')">'
+                     .&mt('Modify this user: [_1]','<span class="LC_cusr_emph">'.$env{'form.ccuname'}.':'.$env{'form.ccdomain'}.' ('.$userinfo.')</span>').'</a>'
+                     .('&nbsp;'x5).'<a href="javascript:backPage(document.userupdate)">'
+                     .&mt('Create/Modify Another User').'</a></p>');
         }
     }
     $r->print(&Apache::loncommon::end_page());
 }
 
 sub update_roles {
-    my ($r) = @_;
+    my ($r,$context) = @_;
     my $now=time;
     my @rolechanges;
     my %disallowed;
@@ -2091,7 +2146,7 @@ sub update_roles {
 		my $result =
 		    &Apache::lonnet::revokerole($env{'form.ccdomain'},
 						$env{'form.ccuname'},
-						$scope,$role);
+						$scope,$role,'','',$context);
 	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
 			      $role,$scope,'<b>'.$result.'</b>').'<br />');
 		if ($role eq 'st') {
@@ -2110,7 +2165,7 @@ sub update_roles {
 		$r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
                       &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
-				  $env{'form.ccuname'},$1,$2,$3,$4).
+				  $env{'form.ccuname'},$1,$2,$3,$4,'','',$context).
 		'</b><br />');
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
@@ -2123,7 +2178,8 @@ sub update_roles {
 		my $result =
 		    &Apache::lonnet::assignrole($env{'form.ccdomain'},
 						$env{'form.ccuname'},
-						$scope,$role,$now,0,1);
+						$scope,$role,$now,0,1,'',
+                                                $context);
 	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
 			      '<b>'.$result.'</b>').'<br />');
 		if ($role eq 'st') {
@@ -2144,7 +2200,7 @@ sub update_roles {
                       $rolename,$rnam,$rdom,$url).': <b>'.
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
-                         0,1).'</b><br />');
+                         0,1,$context).'</b><br />');
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
                 }
@@ -2176,7 +2232,8 @@ sub update_roles {
                     }
                 } else {
 		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
-                               $env{'form.ccuname'},$url,$role,0,$now);
+                               $env{'form.ccuname'},$url,$role,0,$now,'','',
+                               $context);
 		    $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
 			      $role,$url,$result).'<br />';
 		}
@@ -2190,7 +2247,7 @@ sub update_roles {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
                 my $result = &Apache::lonnet::assigncustomrole(
                                $env{'form.ccdomain'}, $env{'form.ccuname'},
-                               $url,$rdom,$rnam,$rolename,0,$now);
+                               $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
                 $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
                           $rolename,$rnam,$rdom,$url,$result).'<br />');
                 if (!grep(/^cr$/,@rolechanges)) {
@@ -2217,7 +2274,7 @@ sub update_roles {
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
                 if ($num_sections == 0) {
-                    $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
+                    $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end,$context));
                 } else {
 		    my %curr_groups =
 			&Apache::longroup::coursegroups($one,$two);
@@ -2228,7 +2285,7 @@ sub update_roles {
                             next;
                         }
                         my $securl = $url.'/'.$sec;
-		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
+		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end,$context));
                     }
                 }
                 if (!grep(/^cr$/,@rolechanges)) {
@@ -2250,7 +2307,7 @@ sub update_roles {
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
                 if ($num_sections == 0) {
-                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context));
                 } else {
                     my %curr_groups = 
 			&Apache::longroup::coursegroups($one,$two);
@@ -2264,13 +2321,13 @@ sub update_roles {
                                 next;
                             }
                             my $securl = $url.'/'.$sec;
-                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec,$context));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'',$context));
                     }
                 }
                 if (!grep(/^\Q$three\E$/,@rolechanges)) {
@@ -2292,19 +2349,19 @@ sub update_roles {
                 my %sections = ();
                 my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two},\%sections,$two);
                 if ($num_sections == 0) {
-                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,''));
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
                 } else {
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         if ($sec ne '') {
                             my $securl = $url.'/'.$sec;
-                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec));
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,''));
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context));
                     }
                 }
                 if (!grep(/^\Q$two\E$/,@rolechanges)) {
@@ -2332,7 +2389,7 @@ sub update_roles {
 }
 
 sub enroll_single_student {
-    my ($r,$uhome,$amode,$genpwd,$now,$newuser) = @_;
+    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
     $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
 
     # Remove non alphanumeric values from section
@@ -2347,7 +2404,7 @@ sub enroll_single_student {
             $env{'form.ccuname'},$env{'form.cid'},$env{'form.cfirstname'},
             $env{'form.cmiddlename'},$env{'form.clastname'},
             $env{'form.generation'},$env{'form.sections'},$enddate,
-            $startdate,'manual',undef,$env{'request.course.id'});
+            $startdate,'manual',undef,$env{'request.course.id'},'',$context);
     if ($enroll_result =~ /^ok/) {
         $r->print(&mt('<b>[_1]</b> enrolled',$env{'form.ccuname'}.':'.$env{'form.ccdomain'}));
         if ($env{'form.sections'} ne '') {
@@ -2667,7 +2724,7 @@ sub make_button_code {
 }
 # ---------------------------------------------------------- Call to definerole
 sub set_custom_role {
-    my ($r) = @_;
+    my ($r,$context) = @_;
     my $rolename=$env{'form.rolename'};
     $rolename=~s/[^A-Za-z0-9]//gs;
     if (!$rolename) {
@@ -2742,7 +2799,7 @@ sub set_custom_role {
 						$url,
 						$env{'user.domain'},
 						$env{'user.name'},
-						$rolename));
+						$rolename,undef,undef,undef,$context));
     }
     $r->print('<p><a href="javascript:backPage(document.customresult,'."'pickrole'".')">'.&mt('Create or edit another custom role').'</a></p><form name="customresult" method="post">');
     $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>');
@@ -2886,7 +2943,7 @@ sub handler {
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         if ($env{'form.phase'} eq 'set_custom_roles') {
-            &set_custom_role($r);
+            &set_custom_role($r,$context);
         } else {
             &custom_role_editor($r);
         }
@@ -2978,7 +3035,7 @@ sub handler {
         if (!exists($env{'form.state'})) {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Configure Self-enrollment',
                                                           'Course_Self_Enrollment'));
-
+            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
             &print_selfenroll_menu($r,$context,$permission);
         } elsif ($env{'form.state'} eq 'done') {
             &Apache::lonhtmlcommon::add_breadcrumb
@@ -2986,9 +3043,19 @@ sub handler {
               text=>"Result"});
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Self-enrollment result',
                                                           'Course_Self_Enrollment'));
-            &update_selfenroll_config($r,$context);
+            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
+            &update_selfenroll_config($r,$context,$permission);
         }
         $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'changelogs') {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=changelogs',
+              text=>"User Management Logs"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Changes',
+                                                      'Course_User_Logs'));
+            &print_userchangelogs_display($r,$context,$permission);
+        $r->print(&Apache::loncommon::end_page());        
     } else {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
@@ -3092,7 +3159,7 @@ sub print_main_menu {
               });
         if (!exists($permission->{'cusr_section'})) {
             push(@courselinks,
-               { text => 'Automated Student Enrollment Manager',
+               { text => 'Automated Enrollment Manager',
                  help => 'Course_Automated_Enrollment',
                  permission => (&Apache::lonnet::auto_run($cnum,$cdom)
                                 && $permission->{'cusr'}),
@@ -3109,7 +3176,17 @@ sub print_main_menu {
                  help => 'Course_Manage_Group',
                  permission => $permission->{'grp_manage'},
                  url => '/adm/coursegroups?refpage=cusr',
-               });
+               },
+               { text => 'View Change Logs',
+                 help => 'Course_User_Logs',
+                 action => 'changelogs',
+                 permission => $permission->{'cusr'},
+               },);
+#               { text => 'View Log-in History',
+#                 help => 'Course_User_Logins',
+#                 action => 'logins',
+#                 permission => $permission->{'cusr'},
+#               });
         push(@menu,@courselinks);
     }
     my $menu_html = '';
@@ -3152,12 +3229,185 @@ sub print_selfenroll_menu {
     my $groupslist = &Apache::lonuserutils::get_groupslist();
     my $setsec_js = 
         &Apache::lonuserutils::setsections_javascript($formname,$groupslist);
+    my %alerts = &Apache::lonlocal::texthash(
+        acto => 'Activation of self-enrollment was selected for the following domain(s)',
+        butn => 'but no user types have been checked.',
+        wilf => "Please uncheck 'activate' or check at least one type.",
+    );
+    my $selfenroll_js = <<"ENDSCRIPT";
+function update_types(caller,num) {
+    var delidx = getIndexByName('selfenroll_delete');
+    var actidx = getIndexByName('selfenroll_activate');
+    if (caller == 'selfenroll_all') {
+        var selall;
+        for (var i=0; i<document.$formname.selfenroll_all.length; i++) {
+            if (document.$formname.selfenroll_all[i].checked) {
+                selall = document.$formname.selfenroll_all[i].value;
+            }
+        }
+        if (selall == 1) {
+            if (delidx != -1) {
+                if (document.$formname.selfenroll_delete.length) {
+                    for (var j=0; j<document.$formname.selfenroll_delete.length; j++) {
+                        document.$formname.selfenroll_delete[j].checked = true;
+                    }
+                } else {
+                    document.$formname.elements[delidx].checked = true;
+                }
+            }
+            if (actidx != -1) {
+                if (document.$formname.selfenroll_activate.length) {
+                    for (var j=0; j<document.$formname.selfenroll_activate.length; j++) {
+                        document.$formname.selfenroll_activate[j].checked = false;
+                    }
+                } else {
+                    document.$formname.elements[actidx].checked = false;
+                }
+            }
+            document.$formname.selfenroll_newdom.selectedIndex = 0; 
+        }
+    }
+    if (caller == 'selfenroll_activate') {
+        if (document.$formname.selfenroll_activate.length) {
+            for (var j=0; j<document.$formname.selfenroll_activate.length; j++) {
+                if (document.$formname.selfenroll_activate[j].value == num) {
+                    if (document.$formname.selfenroll_activate[j].checked) {
+                        for (var i=0; i<document.$formname.selfenroll_all.length; i++) {
+                            if (document.$formname.selfenroll_all[i].value == '1') {
+                                document.$formname.selfenroll_all[i].checked = false;
+                            }
+                            if (document.$formname.selfenroll_all[i].value == '0') {
+                                document.$formname.selfenroll_all[i].checked = true;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            for (var i=0; i<document.$formname.selfenroll_all.length; i++) {
+                if (document.$formname.selfenroll_all[i].value == '1') {
+                    document.$formname.selfenroll_all[i].checked = false;
+                }
+                if (document.$formname.selfenroll_all[i].value == '0') {
+                    document.$formname.selfenroll_all[i].checked = true;
+                }
+            }
+        }
+    }
+    if (caller == 'selfenroll_delete') {
+        if (document.$formname.selfenroll_delete.length) {
+            for (var j=0; j<document.$formname.selfenroll_delete.length; j++) {
+                if (document.$formname.selfenroll_delete[j].value == num) {
+                    if (document.$formname.selfenroll_delete[j].checked) {
+                        var delindex = getIndexByName('selfenroll_types_'+num);
+                        if (delindex != -1) { 
+                            if (document.$formname.elements[delindex].length) {
+                                for (var k=0; k<document.$formname.elements[delindex].length; k++) {
+                                    document.$formname.elements[delindex][k].checked = false;
+                                }
+                            } else {
+                                document.$formname.elements[delindex].checked = false;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            if (document.$formname.selfenroll_delete.checked) {
+                var delindex = getIndexByName('selfenroll_types_'+num);
+                if (delindex != -1) {
+                    if (document.$formname.elements[delindex].length) {
+                        for (var k=0; k<document.$formname.elements[delindex].length; k++) {
+                            document.$formname.elements[delindex][k].checked = false;
+                        }
+                    } else {
+                        document.$formname.elements[delindex].checked = false;
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function validate_types(form) {
+    var needaction = new Array();
+    var countfail = 0;
+    var actidx = getIndexByName('selfenroll_activate');
+    if (actidx != -1) {
+        if (document.$formname.selfenroll_activate.length) {
+            for (var j=0; j<document.$formname.selfenroll_activate.length; j++) {
+                var num = document.$formname.selfenroll_activate[j].value;
+                if (document.$formname.selfenroll_activate[j].checked) {
+                    countfail = check_types(num,countfail,needaction)
+                }
+            }
+        } else {
+            if (document.$formname.selfenroll_activate.checked) {
+                var num = document.enrollstudent.selfenroll_activate.value;
+                countfail = check_types(num,countfail,needaction)
+            }
+        }
+    }
+    if (countfail > 0) {
+        var msg = "$alerts{'acto'}\\n";
+        var loopend = needaction.length -1;
+        if (loopend > 0) {
+            for (var m=0; m<loopend; m++) {
+                msg += needaction[m]+", ";
+            }
+        }
+        msg += needaction[loopend]+"\\n$alerts{'butn'}\\n$alerts{'wilf'}";
+        alert(msg);
+        return; 
+    }
+    setSections(form);
+}
+
+function check_types(num,countfail,needaction) {
+    var typeidx = getIndexByName('selfenroll_types_'+num);
+    var count = 0;
+    if (typeidx != -1) {
+        if (document.$formname.elements[typeidx].length) {
+            for (var k=0; k<document.$formname.elements[typeidx].length; k++) {
+                if (document.$formname.elements[typeidx][k].checked) {
+                    count ++;
+                }
+            }
+        } else {
+            if (document.$formname.elements[typeidx].checked) {
+                count ++;
+            }
+        }
+        if (count == 0) {
+            var domidx = getIndexByName('selfenroll_dom_'+num);
+            if (domidx != -1) {
+                var domname = document.$formname.elements[domidx].value;
+                needaction[countfail] = domname;
+                countfail ++;
+            }
+        }
+    }
+    return countfail;
+}
+
+function getIndexByName(item) {
+    for (var i=0;i<document.$formname.elements.length;i++) {
+        if (document.$formname.elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+ENDSCRIPT
     my $output = '<script type="text/javascript">'."\n".
-                 $setsec_js."\n".
+                 $setsec_js."\n".$selfenroll_js."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n".
-                 '<form name="'.$formname.'" method="post">'."\n".
+                 '<form name="'.$formname.'" method="post" action="/adm/createuser">'."\n".
                  &Apache::lonhtmlcommon::start_pick_box();
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'},'.num'};
     if (ref($row) eq 'ARRAY') {
         foreach my $item (@{$row}) {
             my $title = $item; 
@@ -3169,7 +3419,68 @@ sub print_selfenroll_menu {
                              'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
             if ($item eq 'types') {
                 my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
-                $output .= '<input type="text" name="selfenroll_types" value="'.$curr_types.'" size="50" />';
+                my $showdomdesc = 1;
+                my $includeempty = 1;
+                my $num = 0;
+                $output .= &Apache::loncommon::start_data_table().
+                           &Apache::loncommon::start_data_table_row()
+                           .'<td colspan="2"><span class="LC_nobreak"><label>'
+                           .&mt('Any user in any domain:')
+                           .'&nbsp;<input type="radio" name="selfenroll_all" value="1" ';
+                if ($curr_types eq '*') {
+                    $output .= ' checked="checked" '; 
+                }
+                $output .= 'onchange="javascript:update_types('.
+                           "'selfenroll_all'".');" />'.&mt('Yes').'</label>'.
+                           '&nbsp;&nbsp;<input type="radio" name="selfenroll_all" value="0" ';
+                if ($curr_types ne '*') {
+                    $output .= ' checked="checked" ';
+                }
+                $output .= ' onchange="javascript:update_types('.
+                           "'selfenroll_all'".');"/>'.&mt('No').'</label></td>'.
+                           &Apache::loncommon::end_data_table_row().
+                           &Apache::loncommon::end_data_table().
+                           &mt('Or').'<br />'.
+                           &Apache::loncommon::start_data_table();
+                my %currdoms;
+                if ($curr_types eq '') {
+                    $output .= &new_selfenroll_dom_row($cdom,'0');
+                } elsif ($curr_types ne '*') {
+                    my @entries = split(/;/,$curr_types);
+                    if (@entries > 0) {
+                        foreach my $entry (@entries) {
+                            my ($currdom,$typestr) = split(/:/,$entry);
+                            $currdoms{$currdom} = 1;
+                            my $domdesc = &Apache::lonnet::domain($currdom);
+                            my @currinsttypes = split(',',$typestr);
+                            $output .= &Apache::loncommon::start_data_table_row()
+                                       .'<td valign="top"><span class="LC_nobreak">'.&mt('Domain:').'<b>'
+                                       .'&nbsp;'.$domdesc.' ('.$currdom.')'
+                                       .'</b><input type="hidden" name="selfenroll_dom_'.$num
+                                       .'" value="'.$currdom.'" /></span><br />'
+                                       .'<span class="LC_nobreak"><label><input type="checkbox" '
+                                       .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');" />'
+                                       .&mt('Delete').'</label></span></td>';
+                            $output .= '<td valign="top">&nbsp;&nbsp;'.&mt('User types:').'<br />'
+                                       .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'</td>'
+                                       .&Apache::loncommon::end_data_table_row();
+                            $num ++;
+                        }
+                    }
+                }
+                my $add_domtitle = &mt('Users in additional domain:');
+                if ($curr_types eq '*') { 
+                    $add_domtitle = &mt('Users in specific domain:');
+                } elsif ($curr_types eq '') {
+                    $add_domtitle = &mt('Users in other domain:');
+                }
+                $output .= &Apache::loncommon::start_data_table_row()
+                           .'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />'
+                           .&Apache::loncommon::select_dom_form('','selfenroll_newdom',
+                                                                $includeempty,$showdomdesc)
+                           .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />'
+                           .'</td>'.&Apache::loncommon::end_data_table_row()
+                           .&Apache::loncommon::end_data_table();
             } elsif ($item eq 'registered') {
                 my ($regon,$regoff);
                 if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_registered'}) {
@@ -3180,10 +3491,10 @@ sub print_selfenroll_menu {
                     $regoff = ' checked="checked" ';
                 }
                 $output .= '<label>'.
-                           '<input type="radio" name="registered" value="0"'.$regoff.'/>'.
-                           &mt('No').'</label>&nbsp;&nbsp;<label>'.
-                           '<input type="radio" name="registered" value="1"'.$regon.'/>'.
-                           &mt('Yes').'</label>';
+                           '<input type="radio" name="selfenroll_registered" value="1"'.$regon.'/>'.
+                           &mt('Yes').'</label>&nbsp;&nbsp;<label>'.
+                           '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.'/>'.
+                           &mt('No').'</label>';
             } elsif ($item eq 'enroll_dates') {
                 my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_date'};
                 my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_date'};
@@ -3218,8 +3529,6 @@ sub print_selfenroll_menu {
                 $output .= &selfenroll_date_forms($startform,$endform);
             } elsif ($item eq 'section') {
                 my $currsec = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_section'}; 
-                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                my $cnum = $env{'course.'.$env{'request.course.id'},'.num'};
                 my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
                 my $newsecval;
                 if ($currsec ne 'none' && $currsec ne '') {
@@ -3243,20 +3552,101 @@ sub print_selfenroll_menu {
         }
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box().
-               '<br /><input type="button" name="selfenrollconf" value="'.
-               &mt('Save changes').'" onclick="setSections(this.form);" /></form>';
+               '<br /><input type="button" name="selfenrollconf" value="'
+               .&mt('Save changes').'" onclick="validate_types(this.form);" />'
+               .'<input type="hidden" name="action" value="selfenroll" /></form>';
     $r->print($output);
     return;
 }
 
+sub new_selfenroll_dom_row {
+    my ($newdom,$num) = @_;
+    my $domdesc = &Apache::lonnet::domain($newdom);
+    my $output;
+    if ($domdesc ne '') {
+        $output .= &Apache::loncommon::start_data_table_row()
+                   .'<td valign="top"><span class="LC_nobreak">'.&mt('Domain:').'&nbsp;<b>'.$domdesc
+                   .' ('.$newdom.')</b><input type="hidden" name="selfenroll_dom_'.$num
+                   .'" value="'.$newdom.'" /></span><br />'
+                   .'<span class="LC_nobreak"><label><input type="checkbox" '
+                   .'name="selfenroll_activate" value="'.$num.'" '
+                   .'onchange="javascript:update_types('
+                   ."'selfenroll_activate','$num'".');" />'
+                   .&mt('Activate').'</label></span></td>';
+        my @currinsttypes;
+        $output .= '<td>'.&mt('User types:').'<br />'
+                   .&selfenroll_inst_types($num,$newdom,\@currinsttypes).'</td>'
+                   .&Apache::loncommon::end_data_table_row();
+    }
+    return $output;
+}
+
+sub selfenroll_inst_types {
+    my ($num,$currdom,$currinsttypes) = @_;
+    my $output;
+    my $numinrow = 4;
+    my $count = 0;
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($currdom);
+    my $othervalue = 'any';
+    if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+        if (keys(%{$usertypes}) > 0) {
+            $othervalue = 'other';
+        }
+        $output .= '<table><tr>';
+        foreach my $type (@{$types}) {
+            if (($count > 0) && ($count%$numinrow == 0)) {
+                $output .= '</tr><tr>';
+            }
+            if (defined($usertypes->{$type})) {
+                $output .= '<td><span class="LC_nobreak"><label><input type = "checkbox" value="'.
+                           $type.'" ';
+                if (ref($currinsttypes) eq 'ARRAY') {
+                    if (@{$currinsttypes} > 0) {
+                        if (grep(/^any$/,@{$currinsttypes})) {
+                            $output .= 'checked="checked"';
+                        } elsif (grep(/^\Q$type\E$/,@{$currinsttypes})) {
+                            $output .= 'checked="checked"';
+                        }
+                    } else {
+                        $output .= 'checked="checked"';
+                    }
+                }
+                $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'</label></span></td>';
+            }
+            $count ++;
+        }
+        if (($count > 0) && ($count%$numinrow == 0)) {
+            $output .= '</tr><tr>';
+        }
+        $output .= '<td><span class="LC_nobreak"><label><input type = "checkbox" value="'.$othervalue.'"';
+        if (ref($currinsttypes) eq 'ARRAY') {
+            if (@{$currinsttypes} > 0) {
+                if (grep(/^any$/,@{$currinsttypes})) { 
+                    $output .= ' checked="checked"';
+                } elsif ($othervalue eq 'other') {
+                    if (grep(/^\Q$othervalue\E$/,@{$currinsttypes})) {
+                        $output .= ' checked="checked"';
+                    }
+                }
+            } else {
+                $output .= ' checked="checked"';
+            }
+        } else {
+            $output .= ' checked="checked"';
+        }
+        $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'</label></span></td></tr></table>';
+    }
+    return $output;
+}
+
 sub selfenroll_date_forms {
     my ($startform,$endform) = @_;
     my $output .= &Apache::lonhtmlcommon::start_pick_box()."\n".
-                  &Apache::lonhtmlcommon::row_title(&mt('Starts'),
+                  &Apache::lonhtmlcommon::row_title(&mt('Start date'),
                                                     'LC_oddrow_value')."\n".
                   $startform."\n".
                   &Apache::lonhtmlcommon::row_closure(1).
-                  &Apache::lonhtmlcommon::row_title(&mt('Ends'),
+                  &Apache::lonhtmlcommon::row_title(&mt('End date'),
                                                    'LC_oddrow_value')."\n".
                   $endform."\n".
                   &Apache::lonhtmlcommon::row_closure(1).
@@ -3264,6 +3654,241 @@ sub selfenroll_date_forms {
     return $output;
 }
 
+sub print_userchangelogs_display {
+    my ($r,$context,$permission) = @_;
+    my $formname = 'roleslog';
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
+    if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
+
+    $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">');
+    my %saveable_parameters = ('show' => 'scalar',);
+    &Apache::loncommon::store_course_settings('roles_log',
+                                              \%saveable_parameters);
+    &Apache::loncommon::restore_course_settings('roles_log',
+                                                \%saveable_parameters);
+    # set defaults
+    my $now = time();
+    my $defstart = $now - (7*24*3600); #7 days ago 
+    my %defaults = (
+                     page               => '1',
+                     show               => '10',
+                     role               => 'any',
+                     chgcontext         => 'any',
+                     rolelog_start_date => $defstart,
+                     rolelog_end_date   => $now,
+                   );
+    my $more_records = 0;
+
+    # set current
+    my %curr;
+    foreach my $item ('show','page','role','chgcontext') {
+        $curr{$item} = $env{'form.'.$item};
+    }
+    my ($startdate,$enddate) = 
+        &Apache::lonuserutils::get_dates_from_form('rolelog_start_date','rolelog_end_date');
+    $curr{'rolelog_start_date'} = $startdate;
+    $curr{'rolelog_end_date'} = $enddate;
+    foreach my $key (keys(%defaults)) {
+        if ($curr{$key} eq '') {
+            $curr{$key} = $defaults{$key};
+        }
+    }
+    my (%whodunit,%changed,$version);
+    ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
+    $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
+    my $showntablehdr = 0;
+    my $tablehdr = &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>&nbsp;</th><th>'.&mt('When').'</th><th>'.&mt('Who made the change').
+                   '</th><th>'.&mt('Changed User').'</th><th>'.&mt('Role').'</th><th>'.&mt('Section').'</th><th>'.
+                   &mt('Context').'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
+                   &Apache::loncommon::end_data_table_header_row();
+    my ($minshown,$maxshown);
+    my $minshown = 1;
+    my $count = 0;
+    if ($curr{'show'} ne &mt('all')) { 
+        $maxshown = $curr{'page'} * $curr{'show'};
+        if ($curr{'page'} > 1) {
+            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+        }
+    }
+    foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {
+        next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) ||
+                 ($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));
+        if ($curr{'show'} ne &mt('all')) {
+            if ($count >= $curr{'page'} * $curr{'show'}) {
+                $more_records = 1;
+                last;
+            }
+        }
+        if ($curr{'role'} ne 'any') {
+            next if ($roleslog{$id}{'logentry'}{'role'} ne $curr{'role'}); 
+        }
+        if ($curr{'chgcontext'} ne 'any') {
+            if ($curr{'chgcontext'} eq 'selfenroll') {
+                next if (!$roleslog{$id}{'logentry'}{'selfenroll'});
+            } else {
+                next if ($roleslog{$id}{'logentry'}{'context'} ne $curr{'chgcontext'});
+            }
+        }
+        $count ++;
+        next if ($count < $minshown);
+        if (!$showntablehdr) {
+            $r->print($tablehdr);
+            $showntablehdr = 1;
+        }
+        if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
+            $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
+                &Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});
+        }
+        if ($changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}} eq '') {
+            $changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}} =
+                &Apache::loncommon::plainname($roleslog{$id}{'uname'},$roleslog{$id}{'udom'});
+        }
+        my $sec = $roleslog{$id}{'logentry'}{'section'};
+        if ($sec eq '') {
+            $sec = &mt('None');
+        }
+        my ($rolestart,$roleend);
+        if ($roleslog{$id}{'delflag'}) {
+            $rolestart = &mt('deleted');
+            $roleend = &mt('deleted');
+        } else {
+            $rolestart = $roleslog{$id}{'logentry'}{'start'};
+            $roleend = $roleslog{$id}{'logentry'}{'end'};
+            if ($rolestart eq '' || $rolestart == 0) {
+                $rolestart = &mt('No start date'); 
+            } else {
+                $rolestart = &Apache::lonlocal::locallocaltime($rolestart);
+            }
+            if ($roleend eq '' || $roleend == 0) { 
+                $roleend = &mt('No end date');
+            } else {
+                $roleend = &Apache::lonlocal::locallocaltime($roleend);
+            }
+        }
+        my $chgcontext = $roleslog{$id}{'logentry'}{'context'};
+        if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
+            $chgcontext = 'selfenroll';
+        }
+        my %lt = &rolechg_contexts();
+        if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
+            $chgcontext = $lt{$chgcontext};
+        }
+        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
+    }
+    if ($showntablehdr) {
+        $r->print(&Apache::loncommon::end_data_table().'<br />');
+        if (($curr{'page'} > 1) || ($more_records)) {
+            $r->print('<table><tr>');
+            if ($curr{'page'} > 1) {
+                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            if ($more_records) {
+                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+            }
+            $r->print('</tr></table>');
+            $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+function chgPage(caller) {
+    if (caller == 'previous') {
+        document.$formname.page.value --;
+    }
+    if (caller == 'next') {
+        document.$formname.page.value ++;
+    }
+    document.$formname.submit(); 
+    return;
+}
+</script>
+ENDSCRIPT
+        }
+    } else {
+        $r->print(&mt('There are no records to display'));
+    }
+    $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
+              '<input type="hidden" name="action" value="changelogs" /></form>');
+    return;
+}
+
+sub role_display_filter {
+    my ($formname,$cdom,$cnum,$curr,$version) = @_;
+    my $context = 'course';
+    my $nolink = 1;
+    my $output = '<table><tr><td valign="top">'.
+                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+                                              (&mt('all'),5,10,20,50,100,1000,10000)).
+                 '</td><td>&nbsp;&nbsp;</td>';
+    my $startform =
+        &Apache::lonhtmlcommon::date_setter($formname,'rolelog_start_date',
+                                            $curr->{'rolelog_start_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my $endform =
+        &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
+                                            $curr->{'rolelog_end_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my %lt = &rolechg_contexts();
+    $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br /><table><tr><td>'.&mt('After:').
+               '</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.
+               $endform.'</td></tr></table></td><td>&nbsp;&nbsp;</td>'.
+               '<td valign="top"><b>'.&mt('Role:').'</b><br />'.
+               '<select name="role"><option value="any"';
+    if ($curr->{'role'} eq 'any') {
+        $output .= ' selected="selected"';
+    }
+    $output .=  '>'.&mt('Any').'</option>'."\n";
+    my @roles = &Apache::lonuserutils::course_roles($context,undef,1);
+    foreach my $role (@roles) {
+        my $plrole;
+        if ($role eq 'cr') {
+            $plrole = &mt('Custom Role');
+        } else {
+            $plrole=&Apache::lonnet::plaintext($role);
+        }
+        my $selstr = '';
+        if ($role eq $curr->{'role'}) {
+            $selstr = ' selected="selected"';
+        }
+        $output .= '  <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';
+    }
+    $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="top"><b>'.
+               &mt('Context:').'</b><br /><select name="chgcontext">';
+    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
+        my $selstr = '';
+        if ($curr->{'chgcontext'} eq $chgtype) {
+            $output .= $selstr = ' selected="selected"';
+        }
+        if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
+            next if (!&Apache::lonnet::auto_run($cnum,$cdom));
+        }
+        $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
+    }
+    $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
+               &mt('Update Display').'" /></tr></table>'.
+               '<span class="LC_roleslog_note">'.
+               &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+    if ($version) {
+        $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);    }
+    $output .= '</span><hr noshade><br />';
+    return $output;
+}
+
+sub rolechg_contexts {
+    my %lt = &Apache::lonlocal::texthash (
+                                             any          => 'Any',
+                                             auto         => 'Automated enrollment',
+                                             updatenow    => 'Roster Update',
+                                             createcourse => 'Course Creation',
+                                             course       => 'User Management in course',
+                                             domain       => 'User Management in domain',
+                                             selfenroll   => 'Self-enrolled', 
+                                         );
+    return %lt;
+}
+
 #-------------------------------------------------- functions for &phase_two
 sub user_search_result {
     my ($context,$srch) = @_;
@@ -3296,7 +3921,13 @@ sub user_search_result {
     if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') ||
         ($srch->{'srchin'} eq 'alc')) {
         if ($srch->{'srchby'} eq 'uname') {
-            if ($srch->{'srchterm'} !~ /^$match_username$/) {
+            my $unamecheck = $srch->{'srchterm'};
+            if ($srch->{'srchtype'} eq 'contains') {
+                if ($unamecheck !~ /^\w/) {
+                    $unamecheck = 'a'.$unamecheck; 
+                }
+            }
+            if ($unamecheck !~ /^$match_username$/) {
                 $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
             }
         }
@@ -3887,13 +4518,13 @@ ENDTIMEENTRY
 }
 
 sub update_selfenroll_config {
-    my ($r,$context) = @_;
+    my ($r,$context,$permission) = @_;
     my ($row,$lt) = &get_selfenroll_titles();
-    my $groupslist = &Apache::lonuserutils::get_groupslist();
+    my %curr_groups = &Apache::longroup::coursegroups();
     my (%changes,%warning);
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    $r->print('<h3>'.$lt->{'selfenroll'}.'</h3>'."\n");
+    my $curr_types;
     if (ref($row) eq 'ARRAY') {
         foreach my $item (@{$row}) {
             if ($item eq 'enroll_dates') {
@@ -3914,13 +4545,78 @@ sub update_selfenroll_config {
                         $changes{'internal.selfenroll_'.$type.'_access'} = $newdate{$type};
                     }
                 }
+            } elsif ($item eq 'types') {
+                $curr_types =
+                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
+                if ($env{'form.selfenroll_all'}) {
+                    if ($curr_types ne '*') {
+                        $changes{'internal.selfenroll_types'} = '*';
+                    } else {
+                        next;
+                    }
+                } else {
+                    my %currdoms;
+                    my @entries = split(/;/,$curr_types);
+                    my @deletedoms = &Apache::loncommon::get_env_multiple('form.selfenroll_delete');
+                    my @activations = &Apache::loncommon::get_env_multiple('form.selfenroll_activate');
+                    my $newnum = 0;
+                    my @latesttypes;
+                    foreach my $num (@activations) {
+                        my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$num);
+                        if (@types > 0) {
+                            @types = sort(@types);
+                            my $typestr = join(',',@types);
+                            my $typedom = $env{'form.selfenroll_dom_'.$num};
+                            $latesttypes[$newnum] = $typedom.':'.$typestr;
+                            $currdoms{$typedom} = 1;
+                            $newnum ++;
+                        }
+                    }
+                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
+                            my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j);
+                            if (@types > 0) {
+                                @types = sort(@types);
+                                my $typestr = join(',',@types);
+                                my $typedom = $env{'form.selfenroll_dom_'.$j};
+                                $latesttypes[$newnum] = $typedom.':'.$typestr;
+                                $currdoms{$typedom} = 1;
+                                $newnum ++;
+                            }
+                        }
+                    }
+                    if ($env{'form.selfenroll_newdom'} ne '') {
+                        my $typedom = $env{'form.selfenroll_newdom'};
+                        if ((!defined($currdoms{$typedom})) && 
+                            (&Apache::lonnet::domain($typedom) ne '')) {
+                            my $typestr;
+                            my ($othertitle,$usertypes,$types) = 
+                                &Apache::loncommon::sorted_inst_types($typedom);
+                            my $othervalue = 'any';
+                            if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+                                if (@{$types} > 0) {
+                                    $othervalue = 'other';
+                                    $typestr = join(',',(@{$types},$othervalue));
+                                }
+                                $typestr = $othervalue;
+                            } else {
+                                $typestr = $othervalue;
+                            } 
+                            $latesttypes[$newnum] = $typedom.':'.$typestr;
+                            $newnum ++ ;
+                        }
+                    }
+                    my $selfenroll_types = join(';',@latesttypes);
+                    if ($selfenroll_types ne $curr_types) {
+                        $changes{'internal.selfenroll_types'} = $selfenroll_types;
+                    }
+                }
             } else {
                 my $curr_val = 
                     $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
                 my $newval = $env{'form.selfenroll_'.$item};
                 if ($item eq 'section') {
                     $newval = $env{'form.sections'};
-                    if (grep(/^\Q$newval\E$/,keys(%{$groupslist}))) {
+                    if (defined($curr_groups{$newval})) {
                         $newval = $curr_val;
                         $warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct');
                     } elsif ($newval eq 'all') {
@@ -3934,7 +4630,7 @@ sub update_selfenroll_config {
                 if ($newval ne $curr_val) {
                     $changes{'internal.selfenroll_'.$item} = $newval;
                 }
-            } 
+            }
         }
         if (keys(%warning) > 0) {
             foreach my $item (@{$row}) {
@@ -3974,7 +4670,7 @@ sub update_selfenroll_config {
                         foreach my $type ('start','end') {
                             if (exists($changes{'internal.selfenroll_'.$type.'_date'})) {
                                 my $newdate = &Apache::lonlocal::locallocaltime($changes{'internal.selfenroll_'.$type.'_date'});
-                                $r->print('<li>'.&mt('[_1]: [_2] set to "[_3]".',
+                                $r->print('<li>'.&mt('[_1]: "[_2]" set to "[_3]".',
                                           $title,$type,$newdate).'</li>');
                             }
                         }
@@ -3982,14 +4678,27 @@ sub update_selfenroll_config {
                         foreach my $type ('start','end') {
                             if (exists($changes{'internal.selfenroll_'.$type.'_access'})) {
                                 my $newdate = &Apache::lonlocal::locallocaltime($changes{'internal.selfenroll_'.$type.'_access'});
-                                $r->print('<li>'.&mt('[_1]: [_2] set to "[_3]".',
+                                $r->print('<li>'.&mt('[_1]: "[_2]" set to "[_3]".',
                                           $title,$type,$newdate).'</li>');
                             }
                         }
                     } else {
                         if (exists($changes{'internal.selfenroll_'.$item})) {
-                            $r->print('<li>'.&mt('[_1] set to "[_2]".',$title,
-                                      $changes{'internal.selfenroll_'.$item}).'</li>'."\n");
+                            my $newval = $changes{'internal.selfenroll_'.$item};
+                            if ($item eq 'types') {
+                                if ($newval eq '') {
+                                    $newval = &mt('None');
+                                } elsif ($newval eq '*') {
+                                    $newval = &mt('Any user in any domain');
+                                }
+                            } elsif ($item eq 'registered') {
+                                if ($newval eq '1') {
+                                    $newval = &mt('Yes');
+                                } elsif ($newval eq '0') {
+                                    $newval = &mt('No');
+                                }
+                            }
+                            $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n");
                         }
                     }
                 }
@@ -4003,10 +4712,10 @@ sub update_selfenroll_config {
                 $r->print(&mt('An error occurred when saving changes to self-enrollment settings in this course.').'<br />'.&mt('The error was: [_1].',$putresult));
             }
         } else {
-            $r->print(&mt('No changes were needed to the existing self-enrollment settings in this course.'));
+            $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
         }
     } else {
-        $r->print(&mt('No changes were needed to the existing self-enrollment settings in this course.'));
+        $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
     }
     return;
 }
@@ -4014,12 +4723,11 @@ sub update_selfenroll_config {
 sub get_selfenroll_titles {
     my @row = ('types','registered','enroll_dates','access_dates','section');
     my %lt = &Apache::lonlocal::texthash (
-                selfenroll   => 'Self-enrollment with a student role',
                 types        => 'Users allowed to self-enroll in this course',
-                registered   => 'Restrict self-enrollment to registered students?',
+                registered   => 'Restrict self-enrollment to students officially registered for the course',
                 enroll_dates => 'Dates self-enrollment available',
-                access_dates => 'Access dates for self-enrolled users',
-                section      => 'Section',
+                access_dates => 'Course access dates for self-enrolled users',
+                section      => 'Section assigned to self-enrolled users',
              );
     return (\@row,\%lt);
 }