--- loncom/interface/loncreateuser.pm	2014/02/12 21:29:03	1.391
+++ loncom/interface/loncreateuser.pm	2014/06/30 14:49:35	1.403
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.391 2014/02/12 21:29:03 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.403 2014/06/30 14:49:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1271,11 +1271,9 @@ ENDTITLE
         }
         $r->print('<h2>'.$title.'</h2>'."\n");
         $r->print('<div class="LC_left_float">');
-        my $personal_table = 
-            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
-                                   $inst_results{$ccuname.':'.$ccdomain});
-        # (Do not offer Disable Safeguard here)
-        $r->print($personal_table);
+        $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                         $inst_results{$ccuname.':'.$ccdomain}));
+        # Option to disable student/employee ID conflict checking not offerred for new users.
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
                                                       'default','hide');
@@ -1376,10 +1374,8 @@ ENDAUTH
         }
         $r->print('<h2>'.$title.'</h2>'."\n");
         $r->print('<div class="LC_left_float">');
-        my $personal_table = 
-            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
-                                   $inst_results{$ccuname.':'.$ccdomain});
-        $r->print($personal_table);
+        $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                         $inst_results{$ccuname.':'.$ccdomain}));
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
@@ -1475,7 +1471,8 @@ ENDNOTOOLSPRIV
         }
         $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
     } else {
-        $r->print('<fieldset><legend>'.&mt('Add Roles').'</legend>');
+        $r->print('<div class="LC_left_float">'.
+                  '<fieldset><legend>'.&mt('Add Roles').'</legend>');
         my $addrolesdisplay = 0;
         if ($context eq 'domain' || $context eq 'author') {
             $addrolesdisplay = &new_coauthor_roles($r,$ccuname,$ccdomain);
@@ -1486,27 +1483,32 @@ ENDNOTOOLSPRIV
                 $addrolesdisplay = $add_domainroles;
             }
             $r->print(&course_level_dc($env{'request.role.domain'},$showcredits));
-            $r->print('</fieldset><br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
+            $r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'.
+                      '<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
         } elsif ($context eq 'author') {
             if ($addrolesdisplay) {
-                $r->print('</fieldset><br /><input type="button" value="'.&mt('Save').'"');
+                $r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'.
+                          '<br /><input type="button" value="'.&mt('Save').'"');
                 if ($newuser) {
                     $r->print(' onclick="auth_check()" \>'."\n");
                 } else {
                     $r->print('onclick="this.form.submit()" \>'."\n");
                 }
             } else {
-                $r->print('</fieldset><br /><a href="javascript:backPage(document.cu)">'.
+                $r->print('</fieldset></div>'.
+                          '<div class="LC_clear_float_footer"></div>'.
+                          '<br /><a href="javascript:backPage(document.cu)">'.
                           &mt('Back to previous page').'</a>');
             }
         } else {
             $r->print(&course_level_table(\%inccourses,$showcredits,$defaultcredits));
-            $r->print('</fieldset><br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
+            $r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'.
+                      '<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
         }
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
     $r->print('<input type="hidden" name="currstate" value="" />');
-    $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form>');
+    $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form><br /><br />');
     return;
 }
 
@@ -1811,7 +1813,7 @@ sub display_existing_roles {
             }
         } else {
             $plaintext=
-                &mt('Customrole [_1][_2]defined by [_3]',
+                &mt('Custom role [_1][_2]defined by [_3]',
                         '"'.$croletitle.'"',
                         '<br />',
                         $croleuname.':'.$croleudom);
@@ -1861,7 +1863,7 @@ sub display_existing_roles {
         } else {
             $contextrole = &mt('Existing Roles in this Domain');
         }
-        $r->print('<div>'.
+        $r->print('<div class="LC_left_float">'.
 '<fieldset><legend>'.$contextrole.'</legend>'.
 &Apache::loncommon::start_data_table("LC_createuser").
 &Apache::loncommon::start_data_table_header_row().
@@ -2162,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');
@@ -2204,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>';
+                                }
                             }
                         }
                     }
@@ -2232,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="" />';
+                   '<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" />';
-        my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="10" />';
-        $output .= &Apache::lonhtmlcommon::row_title(&mt('Password'),
+        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').'<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.
@@ -2264,7 +2271,7 @@ sub personal_data_display {
                 } else {
                     if ($context eq 'selfcreate') {
                         if ($canmodify{$item}) {
-                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
                             $editable ++;
                         } else {
                             $hiderow = 1;
@@ -2275,19 +2282,15 @@ sub personal_data_display {
                 }
             } else {
                 if ($context eq 'selfcreate') {
-                    if (($item eq 'permanentemail') && ($newuser eq 'email')) {
-                        $row .= $ccuname;
-                    } else {
-                        if ($canmodify{$item}) {
-                            if ($newuser eq 'email') {
-                                $row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
-                            } else {
-                                $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
-                            }
-                            $editable ++;
+                    if ($canmodify{$item}) {
+                        if ($newuser eq 'email') {
+                            $row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
                         } else {
-                            $hiderow = 1;
+                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />';
                         }
+                        $editable ++;
+                    } else {
+                        $hiderow = 1;
                     }
                 } else {
                     $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
@@ -2296,12 +2299,12 @@ sub personal_data_display {
         } else {
             if ($canmodify{$item}) {
                 $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
+                if (($item eq 'id') && (!$newuser)) {
+                    $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
+                }
             } else {
                 $row .= $userenv{$item};
             }
-            if (($item eq 'id') && ($canmodify{$item})) {
-                 $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
-            }
         }
         $row .= &Apache::lonhtmlcommon::row_closure(1);
         if (!$hiderow) {
@@ -2358,6 +2361,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();
@@ -2713,7 +2717,7 @@ sub update_user_data {
 	    $r->print($error.'Invalid login mode or password'.$end.$rtnlink);    
 	    return;
 	}
-	# Only allow authentification modification if the person has authority
+	# Only allow authentication modification if the person has authority
 	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
 	    $r->print('Modifying authentication: '.
                       &Apache::lonnet::modifyuserauth(
@@ -2723,7 +2727,7 @@ sub update_user_data {
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);    
+	    $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end);    
 	}
     }
     $r->rflush(); # Finish display of header before time consuming actions start
@@ -3040,7 +3044,7 @@ sub update_user_data {
                         my %newenvhash;
                         foreach my $key (keys(%changed)) {
                             if (($key eq 'official') || ($key eq 'unofficial')
-                                || ($key eq 'community')) {
+                                || ($key eq 'community') || ($key eq 'textbook')) {
                                 $newenvhash{'environment.requestcourses.'.$key} =
                                     $changeHash{'requestcourses.'.$key};
                                 if ($changeHash{'requestcourses.'.$key}) {
@@ -3148,9 +3152,9 @@ sub update_user_data {
                 $rolestr = &mt('No roles');
             }
             if ($context eq 'course') {
-                $contextname = &mt('course');
+                $contextname = 'course';
             } elsif ($context eq 'author') {
-                $contextname = &mt('co-author');
+                $contextname = 'co-author';
             }
             $r->print(&mt('The following fields were not updated: ').'<ul>');
             my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
@@ -3159,9 +3163,9 @@ sub update_user_data {
             }
             $r->print('</ul>');
             if (@mod_disallowed == 1) {
-                $r->print(&mt("You do not have the authority to change this field given the user's current set of active/future [_1] roles:",$contextname));
+                $r->print(&mt("You do not have the authority to change this field given the user's current set of active/future $contextname roles:"));
             } else {
-                $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
+                $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future $contextname roles:"));
             }
             my $helplink = 'javascript:helpMenu('."'display'".')';
             $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'
@@ -4009,9 +4013,9 @@ sub enroll_single_student {
         if ($startdate <= $now && !$newuser) {
             $r->print('<p class="LC_info">');
             if ($crstype eq 'Community') {
-                $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
+                $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.'));
             } else {
-                $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
+                $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.'));
            }
            $r->print('</p>');
         }
@@ -4177,6 +4181,7 @@ sub custom_role_editor {
     my $dompriv='';
     my $coursepriv='';
     my $body_top;
+    my $newrole;
     my ($rdummy,$roledef)=
 			 &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 # ------------------------------------------------------- Does this role exist?
@@ -4189,6 +4194,7 @@ sub custom_role_editor {
             $syspriv =~ s/bre\&S//;   
         }
     } else {
+        $newrole = 1;
 	$body_top .= &mt('New Role').' "';
 	$roledef='';
     }
@@ -4458,6 +4464,7 @@ sub set_custom_role {
                  bread_crumbs_component => 'User Management'}; 
     $r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args));
 
+    my $newrole;
     my ($rdummy,$roledef)=
 	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 
@@ -4468,6 +4475,7 @@ sub set_custom_role {
     } else {
 	$r->print(&mt('New Role').' "');
 	$roledef='';
+        $newrole = 1;
     }
     $r->print($rolename.'"</h3>');
 # ------------------------------------------------------- What can be assigned?
@@ -4810,26 +4818,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>');
                             }
                         }
                     }
@@ -4942,25 +4971,49 @@ sub handler {
                      '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'); 
         }
     } elsif ($env{'form.action'} eq 'selfenroll') {
-        push(@{$brcrum},
-                {href => '/adm/createuser?action=selfenroll',
-                 text => "Configure Self-enrollment",
-                 help => 'Course_Self_Enrollment'});
-        if (!exists($env{'form.state'})) {
-            $args = { bread_crumbs           => $brcrum,
-                      bread_crumbs_component => 'Configure Self-enrollment'};
-            $r->print(&header(undef,$args));
-            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
-            &print_selfenroll_menu($r,$context,$permission);
-        } elsif ($env{'form.state'} eq 'done') {
-            push (@{$brcrum},
-                      {href=>'/adm/createuser?action=selfenroll',
-                       text=>"Result"});
-            $args = { bread_crumbs           => $brcrum,
-                      bread_crumbs_component => 'Self-enrollment result'};
-            $r->print(&header(undef,$args));
-            $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
-            &update_selfenroll_config($r,$context,$permission);
+        if ($permission->{selfenrolladmin}) {
+            my $cid = $env{'request.course.id'};
+            my $cdom = $env{'course.'.$cid.'.domain'};
+            my $cnum = $env{'course.'.$cid.'.num'};
+            my %currsettings = (
+                selfenroll_types              => $env{'course.'.$cid.'.internal.selfenroll_types'},
+                selfenroll_registered         => $env{'course.'.$cid.'.internal.selfenroll_registered'},
+                selfenroll_section            => $env{'course.'.$cid.'.internal.selfenroll_section'},
+                selfenroll_notifylist         => $env{'course.'.$cid.'.internal.selfenroll_notifylist'},
+                selfenroll_approval           => $env{'course.'.$cid.'.internal.selfenroll_approval'},
+                selfenroll_limit              => $env{'course.'.$cid.'.internal.selfenroll_limit'},
+                selfenroll_cap                => $env{'course.'.$cid.'.internal.selfenroll_cap'},
+                selfenroll_start_date         => $env{'course.'.$cid.'.internal.selfenroll_start_date'},
+                selfenroll_end_date           => $env{'course.'.$cid.'.internal.selfenroll_end_date'},
+                selfenroll_start_access       => $env{'course.'.$cid.'.internal.selfenroll_start_access'},
+                selfenroll_end_access         => $env{'course.'.$cid.'.internal.selfenroll_end_access'},
+                default_enrollment_start_date => $env{'course.'.$cid.'.default_enrollment_start_date'},
+                default_enrollment_end_date   => $env{'course.'.$cid.'.default_enrollment_end_date'},
+                uniquecode                    => $env{'course.'.$cid.'.internal.uniquecode'},
+            );
+            push(@{$brcrum},
+                    {href => '/adm/createuser?action=selfenroll',
+                     text => "Configure Self-enrollment",
+                     help => 'Course_Self_Enrollment'});
+            if (!exists($env{'form.state'})) {
+                $args = { bread_crumbs           => $brcrum,
+                          bread_crumbs_component => 'Configure Self-enrollment'};
+                $r->print(&header(undef,$args));
+                $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
+                &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings);
+            } elsif ($env{'form.state'} eq 'done') {
+                push (@{$brcrum},
+                          {href=>'/adm/createuser?action=selfenroll',
+                           text=>"Result"});
+                $args = { bread_crumbs           => $brcrum,
+                          bread_crumbs_component => 'Self-enrollment result'};
+                $r->print(&header(undef,$args));
+                $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n");
+                &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
+            }
+        } else {
+            $r->print(&header(undef,{'no_nav_bar' => 1}).
+                     '<span class="LC_error">'.&mt('You do not have permission to configure self-enrollment').'</span>');
         }
     } elsif ($env{'form.action'} eq 'selfenrollqueue') {
         push(@{$brcrum},
@@ -5410,12 +5463,12 @@ sub print_main_menu {
         );
         if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
             push(@{ $menu[2]->{items} },
-                    {   
+                    {
                      linktext => 'Enrollment Requests',
                      icon => 'selfenrl-queue.png',
                      #help => 'Course_Approve_Selfenroll',
                      url => '/adm/createuser?action=selfenrollqueue',
-                     permission => $permission->{'cusr'},
+                     permission => $permission->{'selfenrolladmin'},
                      linktitle =>'Approve or reject enrollment requests.',
                     },
             );
@@ -5441,7 +5494,7 @@ sub print_main_menu {
                  icon => 'self_enroll.png',
                  #help => 'Course_Self_Enrollment',
                  url => '/adm/createuser?action=selfenroll',
-                 permission => $permission->{'cusr'},
+                 permission => $permission->{'selfenrolladmin'},
                  linktitle => 'Configure user self-enrollment.',
                 },
             );
@@ -5478,11 +5531,11 @@ sub restore_prev_selections {
 }
 
 sub print_selfenroll_menu {
-    my ($r,$context,$permission) = @_;
+    my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional) = @_;
     my $crstype = &Apache::loncommon::course_type();
-    my $formname = 'enrollstudent';
+    my $formname = 'selfenroll';
     my $nolink = 1;
-    my ($row,$lt) = &get_selfenroll_titles();
+    my ($row,$lt) = &Apache::lonuserutils::get_selfenroll_titles();
     my $groupslist = &Apache::lonuserutils::get_groupslist();
     my $setsec_js = 
         &Apache::lonuserutils::setsections_javascript($formname,$groupslist);
@@ -5601,7 +5654,7 @@ function validate_types(form) {
             }
         } else {
             if (document.$formname.selfenroll_activate.checked) {
-                var num = document.enrollstudent.selfenroll_activate.value;
+                var num = document.$formname.selfenroll_activate.value;
                 countfail = check_types(num,countfail,needaction)
             }
         }
@@ -5648,6 +5701,26 @@ function check_types(num,countfail,needa
     return countfail;
 }
 
+function toggleNotify() {
+    var selfenrollApproval = 0;
+    if (document.$formname.selfenroll_approval.length) {
+        for (var i=0; i<document.$formname.selfenroll_approval.length; i++) {
+            if (document.$formname.selfenroll_approval[i].checked) {
+                selfenrollApproval = document.$formname.selfenroll_approval[i].value;
+                break;        
+            }
+        }
+    }
+    if (document.getElementById('notified')) {
+        if (selfenrollApproval == 0) {
+            document.getElementById('notified').style.display='none';
+        } else {
+            document.getElementById('notified').style.display='block';
+        }
+    }
+    return;
+}
+
 function getIndexByName(item) {
     for (var i=0;i<document.$formname.elements.length;i++) {
         if (document.$formname.elements[i].name == item) {
@@ -5657,8 +5730,6 @@ function getIndexByName(item) {
     return -1;
 }
 ENDSCRIPT
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $output = '<script type="text/javascript">'."\n".
                  '// <![CDATA['."\n".
@@ -5666,25 +5737,65 @@ ENDSCRIPT
                  '// ]]>'."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
-    my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
-    if (ref($visactions) eq 'HASH') {
-        if ($visible) {
-            $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
+ 
+    my $visactions = &cat_visibility();
+    my ($cathash,%cattype);
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+    if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+        $cathash = $domconfig{'coursecategories'}{'cats'};
+        $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'};
+        $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'};
+    } else {
+        $cathash = {};
+        $cattype{'auth'} = 'std';
+        $cattype{'unauth'} = 'std';
+    }
+    if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) {
+        $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+                  '<br />'.
+                  '<br />'.$visactions->{'take'}.'<ul>'.
+                  '<li>'.$visactions->{'dc_chgconf'}.'</li>'.
+                  '</ul>');
+    } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) {
+        if ($currsettings->{'uniquecode'}) {
+            $r->print('<span class="LC_info">'.$visactions->{'vis'}.'</span>');
         } else {
-            $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
-                      .$visactions->{'yous'}.
-                       '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
-            if (ref($vismsgs) eq 'ARRAY') {
-                $output .= '<br />'.$visactions->{'make'}.'<ul>';
-                foreach my $item (@{$vismsgs}) {
-                    $output .= '<li>'.$visactions->{$item}.'</li>';
+            $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+                  '<br />'.
+                  '<br />'.$visactions->{'take'}.'<ul>'.
+                  '<li>'.$visactions->{'dc_setcode'}.'</li>'.
+                  '</ul><br />');
+        }
+    } else {
+        my ($visible,$cansetvis,$vismsgs) = &visible_in_stdcat($cdom,$cnum,\%domconfig);
+        if (ref($visactions) eq 'HASH') {
+            if ($visible) {
+                $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
+           } else {
+                $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
+                          .$visactions->{'yous'}.
+                           '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
+                if (ref($vismsgs) eq 'ARRAY') {
+                    $output .= '<br />'.$visactions->{'make'}.'<ul>';
+                    foreach my $item (@{$vismsgs}) {
+                        $output .= '<li>'.$visactions->{$item}.'</li>';
+                    }
+                    $output .= '</ul>';
                 }
-                $output .= '</ul>';
+                $output .= '</p>';
             }
-            $output .= '</p>';
         }
     }
-    $output .= '<form name="'.$formname.'" method="post" action="/adm/createuser">'."\n".
+    my $actionhref = '/adm/createuser';
+    if ($context eq 'domain') {
+        $actionhref = '/adm/modifycourse';
+    }
+
+    my %noedit;
+    unless ($context eq 'domain') {
+        %noedit = &get_noedit_fields($cdom,$cnum,$crstype,$row);
+    }
+    $output .= '<form name="'.$formname.'" method="post" action="'.$actionhref.'">'."\n".
                &Apache::lonhtmlcommon::start_pick_box();
     if (ref($row) eq 'ARRAY') {
         foreach my $item (@{$row}) {
@@ -5694,7 +5805,41 @@ ENDSCRIPT
             }
             $output .= &Apache::lonhtmlcommon::row_title($title);
             if ($item eq 'types') {
-                my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
+                my $curr_types;
+                if (ref($currsettings) eq 'HASH') {
+                    $curr_types = $currsettings->{'selfenroll_types'};
+                }
+                if ($noedit{$item}) {
+                    if ($curr_types eq '*') {
+                        $output .= &mt('Any user in any domain');   
+                    } else {
+                        my @entries = split(/;/,$curr_types);
+                        if (@entries > 0) {
+                            $output .= '<ul>'; 
+                            foreach my $entry (@entries) {
+                                my ($currdom,$typestr) = split(/:/,$entry);
+                                next if ($typestr eq '');
+                                my $domdesc = &Apache::lonnet::domain($currdom);
+                                my @currinsttypes = split(',',$typestr);
+                                my ($othertitle,$usertypes,$types) = 
+                                    &Apache::loncommon::sorted_inst_types($currdom);
+                                if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+                                    $usertypes->{'any'} = &mt('any user'); 
+                                    if (keys(%{$usertypes}) > 0) {
+                                        $usertypes->{'other'} = &mt('other users');
+                                    }
+                                    my @longinsttypes = map { $usertypes->{$_}; } @currinsttypes;
+                                    $output .= '<li>'.$domdesc.':'.join(', ',@longinsttypes).'</li>';
+                                 }
+                            }
+                            $output .= '</ul>';
+                        } else {
+                            $output .= &mt('None');
+                        }
+                    }
+                    $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+                    next;
+                }
                 my $showdomdesc = 1;
                 my $includeempty = 1;
                 my $num = 0;
@@ -5759,7 +5904,20 @@ ENDSCRIPT
                            .&Apache::loncommon::end_data_table();
             } elsif ($item eq 'registered') {
                 my ($regon,$regoff);
-                if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_registered'}) {
+                my $registered;
+                if (ref($currsettings) eq 'HASH') {
+                    $registered = $currsettings->{'selfenroll_registered'};
+                }
+                if ($noedit{$item}) {
+                    if ($registered) {
+                        $output .= &mt('Must be registered in course');
+                    } else {
+                        $output .= &mt('No requirement');
+                    }
+                    $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+                    next;
+                }
+                if ($registered) {
                     $regon = ' checked="checked" ';
                     $regoff = ' ';
                 } else {
@@ -5772,13 +5930,22 @@ ENDSCRIPT
                            '<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'};
-                if ($starttime eq '') {
-                    $starttime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'};
-                }
-                if ($endtime eq '') {
-                    $endtime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'};
+                my ($starttime,$endtime);
+                if (ref($currsettings) eq 'HASH') {
+                    $starttime = $currsettings->{'selfenroll_start_date'};
+                    $endtime = $currsettings->{'selfenroll_end_date'};
+                    if ($starttime eq '') {
+                        $starttime = $currsettings->{'default_enrollment_start_date'};
+                    }
+                    if ($endtime eq '') {
+                        $endtime = $currsettings->{'default_enrollment_end_date'};
+                    }
+                }
+                if ($noedit{$item}) {
+                    $output .= &mt('From: [_1], to: [_2]',&Apache::lonlocal::locallocaltime($starttime),
+                                                          &Apache::lonlocal::locallocaltime($endtime));
+                    $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+                    next;
                 }
                 my $startform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
@@ -5788,13 +5955,22 @@ ENDSCRIPT
                                       undef,undef,undef,undef,undef,undef,undef,$nolink);
                 $output .= &selfenroll_date_forms($startform,$endform);
             } elsif ($item eq 'access_dates') {
-                my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_access'};
-                my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_access'};
-                if ($starttime eq '') {
-                    $starttime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'};
-                }
-                if ($endtime eq '') {
-                    $endtime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'};
+                my ($starttime,$endtime);
+                if (ref($currsettings) eq 'HASH') {
+                    $starttime = $currsettings->{'selfenroll_start_access'};
+                    $endtime = $currsettings->{'selfenroll_end_access'};
+                    if ($starttime eq '') {
+                        $starttime = $currsettings->{'default_enrollment_start_date'};
+                    }
+                    if ($endtime eq '') {
+                        $endtime = $currsettings->{'default_enrollment_end_date'};
+                    }
+                }
+                if ($noedit{$item}) {
+                    $output .= &mt('From: [_1], to: [_2]',&Apache::lonlocal::locallocaltime($starttime),
+                                                          &Apache::lonlocal::locallocaltime($endtime));
+                    $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+                    next;
                 }
                 my $startform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
@@ -5804,7 +5980,10 @@ ENDSCRIPT
                                       undef,undef,undef,undef,undef,undef,undef,$nolink);
                 $output .= &selfenroll_date_forms($startform,$endform);
             } elsif ($item eq 'section') {
-                my $currsec = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_section'}; 
+                my $currsec;
+                if (ref($currsettings) eq 'HASH') {
+                    $currsec = $currsettings->{'selfenroll_section'};
+                }
                 my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
                 my $newsecval;
                 if ($currsec ne 'none' && $currsec ne '') {
@@ -5812,6 +5991,15 @@ ENDSCRIPT
                         $newsecval = $currsec;
                     }
                 }
+                if ($noedit{$item}) {
+                    if ($currsec ne '') {
+                        $output .= $currsec;
+                    } else {
+                        $output .= &mt('No specific section');
+                    }
+                    $output .= '<br />'.&mt('(Set by Domain Coordinator)');
+                    next;
+                }
                 my $sections_select = 
                     &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec);
                 $output .= '<table class="LC_createuser">'."\n".
@@ -5821,24 +6009,29 @@ ENDSCRIPT
                            &mt('New section').'<br />'."\n".
                            '<input type="text" name="newsec" size="15" value="'.$newsecval.'" />'."\n".
                            '<input type="hidden" name="sections" value="" />'."\n".
-                           '<input type="hidden" name="state" value="done" />'."\n".
                            '</td></tr></table>'."\n";
             } elsif ($item eq 'approval') {
-                my ($appon,$appoff);
-                my $cid = $env{'request.course.id'};
-                my $currnotified = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
-                if ($env{'course.'.$cid.'.internal.selfenroll_approval'}) {
-                    $appon = ' checked="checked" ';
-                    $appoff = ' ';
-                } else {
-                    $appon = ' ';
-                    $appoff = ' checked="checked" ';
+                my ($currnotified,$currapproval,%appchecked);
+                my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
+                if (ref($currsettings) eq 'HASH') { 
+                    $currnotified = $currsettings->{'selfenroll_notifylist'};
+                    $currapproval = $currsettings->{'selfenroll_approval'};
+                }
+                if ($currapproval !~ /^[012]$/) {
+                    $currapproval = 0;
+                }
+                if ($noedit{$item}) {
+                    $output .=  $selfdescs{'approval'}{$currapproval}.
+                                '<br />'.&mt('(Set by Domain Coordinator)');
+                    next;
+                }
+                $appchecked{$currapproval} = ' checked="checked"';
+                for my $i (0..2) {
+                    $output .= '<label>'.
+                               '<input type="radio" name="selfenroll_approval" value="'.$i.'"'.
+                               $appchecked{$i}.' onclick="toggleNotify();" />'.$selfdescs{'approval'}{$i}.
+                               '</label>'.('&nbsp;'x2);
                 }
-                $output .= '<label>'.
-                           '<input type="radio" name="selfenroll_approval" value="1"'.$appon.'/>'.
-                           &mt('Yes').'</label>&nbsp;&nbsp;<label>'.
-                           '<input type="radio" name="selfenroll_approval" value="0"'.$appoff.'/>'.
-                           &mt('No').'</label>';
                 my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
                 my (@ccs,%notified);
                 my $ccrole = 'cc';
@@ -5857,7 +6050,13 @@ ENDSCRIPT
                     }
                 }
                 if (@ccs) {
-                    $output .= '<br />'.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').'&nbsp;'.&Apache::loncommon::start_data_table().
+                    my $style;
+                    unless ($currapproval) {
+                        $style = ' style="display: none;"'; 
+                    }
+                    $output .= '<br /><div id="notified"'.$style.'>'.
+                               &mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').'&nbsp;'.
+                               &Apache::loncommon::start_data_table().
                                &Apache::loncommon::start_data_table_row();
                     my $count = 0;
                     my $numcols = 4;
@@ -5885,14 +6084,29 @@ ENDSCRIPT
                         }
                     }
                     $output .= &Apache::loncommon::end_data_table_row().
-                               &Apache::loncommon::end_data_table();
+                               &Apache::loncommon::end_data_table().
+                               '</div>';
                 }
             } elsif ($item eq 'limit') {
-                my ($crslimit,$selflimit,$nolimit);
-                my $cid = $env{'request.course.id'};
-                my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'};
-                my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
-                $nolimit = ' checked="checked" ';
+                my ($crslimit,$selflimit,$nolimit,$currlim,$currcap);
+                if (ref($currsettings) eq 'HASH') {
+                    $currlim = $currsettings->{'selfenroll_limit'};
+                    $currcap = $currsettings->{'selfenroll_cap'};
+                }
+                if ($noedit{$item}) {
+                    if (($currlim eq 'allstudents') || ($currlim eq 'selfenrolled')) {
+                        if ($currlim eq 'allstudents') {
+                            $output .= &mt('Limit by total students');
+                        } elsif ($currlim eq 'selfenrolled') {
+                            $output .= &mt('Limit by total self-enrolled students');
+                        }
+                        $output .= ' '.&mt('Maximum: [_1]',$currcap).
+                                   '<br />'.&mt('(Set by Domain Coordinator)');
+                    } else {
+                        $output .= &mt('No limit').'<br />'.&mt('(Set by Domain Coordinator)');
+                    }
+                    next;
+                }
                 if ($currlim eq 'allstudents') {
                     $crslimit = ' checked="checked" ';
                     $selflimit = ' ';
@@ -5904,6 +6118,7 @@ ENDSCRIPT
                 } else {
                     $crslimit = ' ';
                     $selflimit = ' ';
+                    $nolimit = ' checked="checked" ';
                 }
                 $output .= '<table><tr><td><label>'.
                            '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.'/>'.
@@ -5923,42 +6138,51 @@ ENDSCRIPT
     $output .= &Apache::lonhtmlcommon::end_pick_box().
                '<br /><input type="button" name="selfenrollconf" value="'
                .&mt('Save').'" onclick="validate_types(this.form);" />'
-               .'<input type="hidden" name="action" value="selfenroll" /></form>';
+               .'<input type="hidden" name="action" value="selfenroll" />'
+               .'<input type="hidden" name="state" value="done" />'."\n".
+               $additional.'</form>';
     $r->print($output);
     return;
 }
 
-sub visible_in_cat {
-    my ($cdom,$cnum) = @_;
-    my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
-    my ($cathash,%settable,@vismsgs,$cansetvis);
-    my %visactions = &Apache::lonlocal::texthash(
-                   vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
-                   gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
-                   miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
-                   yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
-                   coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
-                   make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
-                   take => 'Take the following action to ensure the course appears in the Catalog:',
-                   dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
-                   dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
-                   dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
-                   dc_catalog  => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
-                   dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
-                   dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
-                   dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
-    );
-    $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
-    $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
-    $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
-    if (ref($domconf{'coursecategories'}) eq 'HASH') {
-        if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+sub get_noedit_fields {
+    my ($cdom,$cnum,$crstype,$row) = @_;
+    my %noedit;
+    if (ref($row) eq 'ARRAY') {
+        my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook',
+                                                           'internal.selfenrollmgrdc',
+                                                           'internal.selfenrollmgrcc'],$cdom,$cnum);
+        my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings);
+        my (%specific_managebydc,%specific_managebycc,%default_managebydc);
+        map { $specific_managebydc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrdc'}));
+        map { $specific_managebycc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrcc'}));
+        my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+        map { $default_managebydc{$_} = 1; } (split(/,/,$domdefaults{$type.'selfenrolladmdc'}));
+
+        foreach my $item (@{$row}) {
+            next if ($specific_managebycc{$item});
+            if (($specific_managebydc{$item}) || ($default_managebydc{$item})) {
+                $noedit{$item} = 1;
+            }
+        }
+    }
+    return %noedit;
+} 
+
+sub visible_in_stdcat {
+    my ($cdom,$cnum,$domconf) = @_;
+    my ($cathash,%settable,@vismsgs,$cansetvis,$visible);
+    unless (ref($domconf) eq 'HASH') {
+        return ($visible,$cansetvis,\@vismsgs);
+    }
+    if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+        if ($domconf->{'coursecategories'}{'togglecats'} eq 'crs') {
             $settable{'togglecats'} = 1;
         }
-        if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+        if ($domconf->{'coursecategories'}{'categorize'} eq 'crs') {
             $settable{'categorize'} = 1;
         }
-        $cathash = $domconf{'coursecategories'}{'cats'};
+        $cathash = $domconf->{'coursecategories'}{'cats'};
     }
     if ($settable{'togglecats'} && $settable{'categorize'}) {
         $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');   
@@ -5973,10 +6197,10 @@ sub visible_in_cat {
     my %currsettings =
         &Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'],
                              $cdom,$cnum);
-    my $visible = 0;
+    $visible = 0;
     if ($currsettings{'internal.coursecode'} ne '') {
-        if (ref($domconf{'coursecategories'}) eq 'HASH') {
-            $cathash = $domconf{'coursecategories'}{'cats'};
+        if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+            $cathash = $domconf->{'coursecategories'}{'cats'};
             if (ref($cathash) eq 'HASH') {
                 if ($cathash->{'instcode::0'} eq '') {
                     push(@vismsgs,'dc_addinst'); 
@@ -6000,8 +6224,8 @@ sub visible_in_cat {
     }
     if ($currsettings{'categories'} ne '') {
         my $cathash;
-        if (ref($domconf{'coursecategories'}) eq 'HASH') {
-            $cathash = $domconf{'coursecategories'}{'cats'};
+        if (ref($domconf->{'coursecategories'}) eq 'HASH') {
+            $cathash = $domconf->{'coursecategories'}{'cats'};
             if (ref($cathash) eq 'HASH') {
                 if (keys(%{$cathash}) == 0) {
                     push(@vismsgs,'dc_catalog');
@@ -6047,7 +6271,33 @@ sub visible_in_cat {
             unshift(@vismsgs,'dc_unhide')
         }
     }
-    return ($visible,$cansetvis,\@vismsgs,\%visactions);
+    return ($visible,$cansetvis,\@vismsgs);
+}
+
+sub cat_visibility {
+    my %visactions = &Apache::lonlocal::texthash(
+                   vis => 'This course/community currently appears in the Course/Community Catalog for this domain.',
+                   gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
+                   miss => 'This course/community does not currently appear in the Course/Community Catalog for this domain.',
+                   none => 'Display of a course catalog is disabled for this domain.',
+                   yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding this course.',
+                   coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
+                   make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
+                   take => 'Take the following action to ensure the course appears in the Catalog:',
+                   dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
+                   dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
+                   dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
+                   dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
+                   dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
+                   dc_catalog  => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
+                   dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
+                   dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
+                   dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
+    );
+    $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+    $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+    $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+    return \%visactions;
 }
 
 sub new_selfenroll_dom_row {
@@ -7060,13 +7310,13 @@ sub course_level_table {
                 ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) {
                 $table .= &course_level_row($protectedcourse,$role,$area,$domain,
                                             $plrole,\%sections_count,\%lt,
-                                            $defaultcredits,$crstype);
+                                            $showcredits,$defaultcredits,$crstype);
             } elsif ($env{'request.course.sec'} ne '') {
                 if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
                                              $env{'request.course.sec'})) {
                     $table .= &course_level_row($protectedcourse,$role,$area,$domain,
                                                 $plrole,\%sections_count,\%lt,
-                                                $defaultcredits,$crstype);
+                                                $showcredits,$defaultcredits,$crstype);
                 }
             }
         }
@@ -7075,7 +7325,8 @@ sub course_level_table {
                 next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/);
                 my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;
                 $table .= &course_level_row($protectedcourse,$role,$area,$domain,
-                                            $cust,\%sections_count,\%lt);
+                                            $cust,\%sections_count,\%lt,
+                                            $showcredits,$defaultcredits,$crstype);
             }
 	}
     }
@@ -7089,7 +7340,11 @@ sub course_level_table {
 &Apache::loncommon::start_data_table().
 &Apache::loncommon::start_data_table_header_row().
 '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'."\n".
-'<th>'.$lt{'ext'}.'</th><th>'.$lt{'crd'}.'</th>'."\n".
+'<th>'.$lt{'ext'}.'</th><th>'."\n";
+    if ($showcredits) {
+        $result .= $lt{'crd'}.'</th>';
+    }
+    $result .=
 '<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th>'."\n".
 '<th>'.$lt{'end'}.'</th>'.
 &Apache::loncommon::end_data_table_header_row().
@@ -7100,14 +7355,14 @@ $table.
 
 sub course_level_row {
     my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,
-        $lt,$defaultcredits,$crstype) = @_;
+        $lt,$showcredits,$defaultcredits,$crstype) = @_;
     my $creditem;
     my $row = &Apache::loncommon::start_data_table_row().
               ' <td><input type="checkbox" name="act_'.
               $protectedcourse.'_'.$role.'" /></td>'."\n".
               ' <td>'.$plrole.'</td>'."\n".
               ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
-    if (($role eq 'st') && ($crstype eq 'Course')) {
+    if (($showcredits) && ($role eq 'st') && ($crstype eq 'Course')) {
         $row .= 
             '<td><input type="text" name="credits_'.$protectedcourse.'_'.
             $role.'" size="3" value="'.$defaultcredits.'" /></td>';
@@ -7184,8 +7439,9 @@ sub course_level_dc {
                  &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row().
                  '<th>'.$lt{'scc'}.'</th><th>'.$lt{'rol'}.'</th>'."\n".
-                 '<th>'.$lt{'grs'}.'</th><th>'.$lt{'crd'}.'</th>'."\n".
-                 '<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'."\n".
+                 '<th>'.$lt{'grs'}.'</th>'."\n";
+    $header .=   '<th>'.$lt{'crd'}.'</th>'."\n" if ($showcredits);
+    $header .=   '<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'."\n".
                  &Apache::loncommon::end_data_table_header_row();
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
                      '<td><br /><span class="LC_nobreak"><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" />'.
@@ -7215,7 +7471,7 @@ sub course_level_dc {
                      '</tr></table></td>'."\n";
     if ($showcredits) {
         $otheritems .= '<td><br />'."\n".
-                       '<input type="text" size="3" name="credits" value="" />'."\n";
+                       '<input type="text" size="3" name="credits" value="" /></td>'."\n";
     }
     $otheritems .= <<ENDTIMEENTRY;
 <td><br /><input type="hidden" name="start" value='' />
@@ -7231,19 +7487,23 @@ ENDTIMEENTRY
 }
 
 sub update_selfenroll_config {
-    my ($r,$context,$permission) = @_;
-    my ($row,$lt) = &get_selfenroll_titles();
-    my %curr_groups = &Apache::longroup::coursegroups();
+    my ($r,$cid,$cdom,$cnum,$context,$crstype,$currsettings) = @_;
+    return unless (ref($currsettings) eq 'HASH');
+    my ($row,$lt) = &Apache::lonuserutils::get_selfenroll_titles();
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
     my (%changes,%warning);
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $curr_types;
+    my %noedit;
+    unless ($context eq 'domain') {
+        %noedit = &get_noedit_fields($cdom,$cnum,$crstype,$row);
+    }
     if (ref($row) eq 'ARRAY') {
         foreach my $item (@{$row}) {
+            next if ($noedit{$item});
             if ($item eq 'enroll_dates') {
                 my (%currenrolldate,%newenrolldate);
                 foreach my $type ('start','end') {
-                    $currenrolldate{$type} = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$type.'_date'};
+                    $currenrolldate{$type} = $currsettings->{'selfenroll_'.$type.'_date'};
                     $newenrolldate{$type} = &Apache::lonhtmlcommon::get_date_from_form('selfenroll_'.$type.'_date');
                     if ($newenrolldate{$type} ne $currenrolldate{$type}) {
                         $changes{'internal.selfenroll_'.$type.'_date'} = $newenrolldate{$type};
@@ -7252,15 +7512,14 @@ sub update_selfenroll_config {
             } elsif ($item eq 'access_dates') {
                 my (%currdate,%newdate);
                 foreach my $type ('start','end') {
-                    $currdate{$type} = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$type.'_access'};
+                    $currdate{$type} = $currsettings->{'selfenroll_'.$type.'_access'};
                     $newdate{$type} = &Apache::lonhtmlcommon::get_date_from_form('selfenroll_'.$type.'_access');
                     if ($newdate{$type} ne $currdate{$type}) {
                         $changes{'internal.selfenroll_'.$type.'_access'} = $newdate{$type};
                     }
                 }
             } elsif ($item eq 'types') {
-                $curr_types =
-                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
+                $curr_types = $currsettings->{'selfenroll_'.$item};
                 if ($env{'form.selfenroll_all'}) {
                     if ($curr_types ne '*') {
                         $changes{'internal.selfenroll_types'} = '*';
@@ -7329,9 +7588,9 @@ sub update_selfenroll_config {
                 my $newlimit = $env{'form.selfenroll_limit'};
                 my $newcap = $env{'form.selfenroll_cap'};
                 $newcap =~s/\s+//g;
-                my $currlimit =  $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'};
+                my $currlimit =  $currsettings->{'selfenroll_limit'};
                 $currlimit = 'none' if ($currlimit eq '');
-                my $currcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'};
+                my $currcap = $currsettings->{'selfenroll_cap'};
                 if ($newlimit ne $currlimit) {
                     if ($newlimit ne 'none') {
                         if ($newcap =~ /^\d+$/) {
@@ -7340,7 +7599,8 @@ sub update_selfenroll_config {
                             }
                             $changes{'internal.selfenroll_limit'} = $newlimit;
                         } else {
-                            $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); 
+                            $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.
+                                &mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); 
                         }
                     } elsif ($currcap ne '') {
                         $changes{'internal.selfenroll_cap'} = '';
@@ -7352,13 +7612,14 @@ sub update_selfenroll_config {
                             $changes{'internal.selfenroll_cap'} = $newcap;
                         }
                     } else {
-                        $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');
+                        $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.
+                            &mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.');
                     }
                 }
             } elsif ($item eq 'approval') {
                 my (@currnotified,@newnotified);
-                my $currapproval = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
-                my $currnotifylist = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
+                my $currapproval = $currsettings->{'selfenroll_approval'};
+                my $currnotifylist = $currsettings->{'selfenroll_notifylist'};
                 if ($currnotifylist ne '') {
                     @currnotified = split(/,/,$currnotifylist);
                     @currnotified = sort(@currnotified);
@@ -7394,14 +7655,14 @@ sub update_selfenroll_config {
                     }
                 }
             } else {
-                my $curr_val = 
-                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item};
+                my $curr_val = $currsettings->{'selfenroll_'.$item};
                 my $newval = $env{'form.selfenroll_'.$item};
                 if ($item eq 'section') {
                     $newval = $env{'form.sections'};
                     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');
+                        $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') {
                         $newval = $curr_val;
                         $warning{$item} = &mt('Section for self-enrolled users unchanged, as "all" is a reserved section name.');
@@ -7431,11 +7692,10 @@ sub update_selfenroll_config {
                     my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
                                                                 $cnum,undef,undef,'Course');
                     my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
-                    if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                    if (ref($crsinfo{$cid}) eq 'HASH') {
                         foreach my $item ('selfenroll_types','selfenroll_start_date','selfenroll_end_date') {
                             if (exists($changes{'internal.'.$item})) {
-                                $crsinfo{$env{'request.course.id'}}{$item} = 
-                                    $changes{'internal.'.$item};
+                                $crsinfo{$cid}{$item} = $changes{'internal.'.$item};
                             }
                         }
                         my $crsputresult =
@@ -7472,7 +7732,7 @@ sub update_selfenroll_config {
                             if ($changes{'internal.selfenroll_cap'} ne '') {
                                 $newcap = $changes{'internal.selfenroll_cap'}
                             } else {
-                                $newcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'};
+                                $newcap = $currsettings->{'selfenroll_cap'};
                             }
                             if ($changes{'internal.selfenroll_limit'} eq 'none') {
                                 $newval = &mt('No limit');
@@ -7482,7 +7742,7 @@ sub update_selfenroll_config {
                             } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
                                 $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap);
                             } else {
-                                my $currlimit =  $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'};
+                                my $currlimit =  $currsettings->{'selfenroll_limit'};
                                 if ($currlimit eq 'allstudents') {
                                     $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);
                                 } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
@@ -7494,24 +7754,24 @@ sub update_selfenroll_config {
                     } elsif ($item eq 'approval') {
                         if ((exists($changes{'internal.selfenroll_approval'})) ||
                             (exists($changes{'internal.selfenroll_notifylist'}))) {
+                            my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
                             my ($newval,$newnotify);
                             if (exists($changes{'internal.selfenroll_notifylist'})) {
                                 $newnotify = $changes{'internal.selfenroll_notifylist'};
                             } else {   
-                                $newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'};
+                                $newnotify = $currsettings->{'selfenroll_notifylist'};
                             }
-                            if ($changes{'internal.selfenroll_approval'}) {
-                                $newval = &mt('Yes');
-                            } elsif ($changes{'internal.selfenroll_approval'} eq '0') {
-                                $newval = &mt('No');
+                            if (exists($changes{'internal.selfenroll_approval'})) {
+                                if ($changes{'internal.selfenroll_approval'} !~ /^[012]$/) {
+                                    $changes{'internal.selfenroll_approval'} = '0';
+                                }
+                                $newval = $selfdescs{'approval'}{$changes{'internal.selfenroll_approval'}};
                             } else {
-                                my $currapproval = 
-                                    $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'};
-                                if ($currapproval) {
-                                    $newval = &mt('Yes');
-                                } else {
-                                    $newval = &mt('No');
+                                my $currapproval = $currsettings->{'selfenroll_approval'}; 
+                                if ($currapproval !~ /^[012]$/) {
+                                    $currapproval = 0;
                                 }
+                                $newval = $selfdescs{'approval'}{$currapproval};
                             }
                             $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval));
                             if ($newnotify) {
@@ -7542,13 +7802,16 @@ sub update_selfenroll_config {
                     }
                 }
                 $r->print('</ul>');
-                my %newenvhash;
-                foreach my $key (keys(%changes)) {
-                    $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $changes{$key};
+                if ($env{'course.'.$cid.'.description'} ne '') {
+                    my %newenvhash;
+                    foreach my $key (keys(%changes)) {
+                        $newenvhash{'course.'.$cid.'.'.$key} = $changes{$key};
+                    }
+                    &Apache::lonnet::appenv(\%newenvhash);
                 }
-                &Apache::lonnet::appenv(\%newenvhash);
             } else {
-                $r->print(&mt('An error occurred when saving changes to self-enrollment settings in this course.').'<br />'.&mt('The error was: [_1].',$putresult));
+                $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 made to the existing self-enrollment settings in this course.'));
@@ -7556,39 +7819,54 @@ sub update_selfenroll_config {
     } else {
         $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.'));
     }
-    my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
-    if (ref($visactions) eq 'HASH') {
-        if (!$visible) {
+    my $visactions = &cat_visibility();
+    my ($cathash,%cattype);
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+    if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+        $cathash = $domconfig{'coursecategories'}{'cats'};
+        $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'};
+        $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'};
+    } else {
+        $cathash = {};
+        $cattype{'auth'} = 'std';
+        $cattype{'unauth'} = 'std';
+    }
+    if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) {
+        $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+                  '<br />'.
+                  '<br />'.$visactions->{'take'}.'<ul>'.
+                  '<li>'.$visactions->{'dc_chgconf'}.'</li>'.
+                  '</ul>');
+    } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) {
+        if ($currsettings->{'uniquecode'}) {
+            $r->print('<span class="LC_info">'.$visactions->{'vis'}.'</span>');
+        } else {
             $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
-                      '<br />');
-            if (ref($vismsgs) eq 'ARRAY') {
-                $r->print('<br />'.$visactions->{'take'}.'<ul>');
-                foreach my $item (@{$vismsgs}) {
-                    $r->print('<li>'.$visactions->{$item}.'</li>');
+                  '<br />'.
+                  '<br />'.$visactions->{'take'}.'<ul>'.
+                  '<li>'.$visactions->{'dc_setcode'}.'</li>'.
+                  '</ul><br />');
+        }
+    } else {
+        my ($visible,$cansetvis,$vismsgs) = &visible_in_stdcat($cdom,$cnum,\%domconfig);
+        if (ref($visactions) eq 'HASH') {
+            if (!$visible) {
+                $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}.
+                          '<br />');
+                if (ref($vismsgs) eq 'ARRAY') {
+                    $r->print('<br />'.$visactions->{'take'}.'<ul>');
+                    foreach my $item (@{$vismsgs}) {
+                        $r->print('<li>'.$visactions->{$item}.'</li>');
+                    }
+                    $r->print('</ul>');
                 }
-                $r->print('</ul>');
+                $r->print($cansetvis);
             }
-            $r->print($cansetvis);
         }
     } 
     return;
 }
 
-sub get_selfenroll_titles {
-    my @row = ('types','registered','enroll_dates','access_dates','section',
-               'approval','limit');
-    my %lt = &Apache::lonlocal::texthash (
-                types        => 'Users allowed to self-enroll in this course',
-                registered   => 'Restrict self-enrollment to students officially registered for the course',
-                enroll_dates => 'Dates self-enrollment available',
-                access_dates => 'Course access dates assigned to self-enrolling users',
-                section      => 'Section assigned to self-enrolling users',
-                approval     => 'Self-enrollment requests need approval?',
-                limit        => 'Enrollment limit',
-             );
-    return (\@row,\%lt);
-}
-
 #---------------------------------------------- end functions for &phase_two
 
 #--------------------------------- functions for &phase_two and &phase_three