--- loncom/interface/loncreateuser.pm	2014/03/26 18:18:24	1.397
+++ loncom/interface/loncreateuser.pm	2014/03/31 02:31:05	1.398
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.397 2014/03/26 18:18:24 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.398 2014/03/31 02:31:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4975,25 +4975,48 @@ 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'},
+            );
+            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,\%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},
@@ -5443,12 +5466,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.',
                     },
             );
@@ -5474,7 +5497,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.',
                 },
             );
@@ -5511,11 +5534,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);
@@ -5634,7 +5657,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)
             }
         }
@@ -5681,6 +5704,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) {
@@ -5690,8 +5733,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".
@@ -5717,7 +5758,11 @@ ENDSCRIPT
             $output .= '</p>';
         }
     }
-    $output .= '<form name="'.$formname.'" method="post" action="/adm/createuser">'."\n".
+    my $actionhref = '/adm/createuser';
+    if ($context eq 'domain') {
+        $actionhref = '/adm/modifycourse';
+    }
+    $output .= '<form name="'.$formname.'" method="post" action="'.$actionhref.'">'."\n".
                &Apache::lonhtmlcommon::start_pick_box();
     if (ref($row) eq 'ARRAY') {
         foreach my $item (@{$row}) {
@@ -5727,7 +5772,10 @@ 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'};
+                }
                 my $showdomdesc = 1;
                 my $includeempty = 1;
                 my $num = 0;
@@ -5792,7 +5840,11 @@ 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 ($registered) {
                     $regon = ' checked="checked" ';
                     $regoff = ' ';
                 } else {
@@ -5805,13 +5857,16 @@ 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'};
+                    }
                 }
                 my $startform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
@@ -5821,13 +5876,16 @@ 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'};
+                    }
                 }
                 my $startform =
                     &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
@@ -5837,7 +5895,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 '') {
@@ -5857,21 +5918,22 @@ ENDSCRIPT
                            '<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;
+                }
+                $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';
@@ -5890,7 +5952,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;
@@ -5918,14 +5986,15 @@ 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 ($currlim eq 'allstudents') {
                     $crslimit = ' checked="checked" ';
                     $selflimit = ' ';
@@ -5937,6 +6006,7 @@ ENDSCRIPT
                 } else {
                     $crslimit = ' ';
                     $selflimit = ' ';
+                    $nolimit = ' checked="checked" ';
                 }
                 $output .= '<table><tr><td><label>'.
                            '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.'/>'.
@@ -5956,7 +6026,8 @@ 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" />'.
+               $additional.'</form>';
     $r->print($output);
     return;
 }
@@ -5966,10 +6037,10 @@ sub visible_in_cat {
     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.',
+                   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 => '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.',
+                   miss => 'This 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 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:',
@@ -7265,19 +7336,18 @@ 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,$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;
     if (ref($row) eq 'ARRAY') {
         foreach my $item (@{$row}) {
             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};
@@ -7286,15 +7356,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'} = '*';
@@ -7363,9 +7432,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+$/) {
@@ -7374,7 +7443,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'} = '';
@@ -7386,13 +7456,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);
@@ -7428,14 +7499,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.');
@@ -7465,11 +7536,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 =
@@ -7506,7 +7576,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');
@@ -7516,7 +7586,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') {
@@ -7528,24 +7598,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) {
@@ -7576,13 +7646,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.'));
@@ -7608,21 +7681,6 @@ sub update_selfenroll_config {
     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