--- loncom/interface/lonmodifycourse.pm	2013/07/09 00:17:23	1.61
+++ loncom/interface/lonmodifycourse.pm	2014/07/31 15:45:27	1.74
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.61 2013/07/09 00:17:23 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.74 2014/07/31 15:45:27 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,16 +34,17 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonuserutils;
+use Apache::loncreateuser;
 use Apache::lonpickcourse;
 use lib '/home/httpd/lib/perl';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub get_dc_settable {
     my ($type,$cdom) = @_;
     if ($type eq 'Community') {
-        return ('courseowner');
+        return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
     } else {
-        my @items = ('courseowner','coursecode','authtype','autharg');
+        my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
         if (&showcredits($cdom)) {
             push(@items,'defaultcredits');
         }
@@ -122,6 +123,8 @@ sub get_enrollment_settings {
                 if (&showcredits($cdom)) {
                     $enrollvar{$type} = $settings{$item};
                 }
+            } elsif ($type eq 'selfenrollmgr') {
+                $enrollvar{$type} = $settings{$item};    
             } elsif ($type eq 'courseowner') {
                 if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
                     $enrollvar{$type} = $settings{$item};
@@ -153,10 +156,7 @@ sub print_course_search_page {
         $type = 'Course';
     }
     &print_header($r,$type);
-    my $filterlist = ['descriptfilter',
-                      'instcodefilter','ownerfilter',
-                      'coursefilter'];
-    my $filter = {};
+    my ($filterlist,$filter) = &get_filters($dom);
     my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';
     if ($type eq 'Community') {
@@ -164,15 +164,15 @@ sub print_course_search_page {
     }
     $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     $dctitle = &Apache::lonnet::plaintext('dc');
-    $r->print(&Apache::lonpickcourse::js_changer());
+    $r->print(&Apache::loncommon::js_changer());
     if ($type eq 'Community') {
         $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
     } else {
         $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
-    }   
-    $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                             undef,undef,$filter,$action,\$numtitles,'modifycourse',
-                             undef,undef,undef,\@codetitles));
+    }
+    $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
+                                                \$numtitles,'modifycourse',undef,undef,undef,
+                                                \@codetitles,$dom));
     if ($type eq 'Community') {
         $r->print(&mt('Actions available after searching for a community:').'<ul>'.
                   '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
@@ -184,6 +184,7 @@ sub print_course_search_page {
                   '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
                   '</li>'."\n".'</ul>');
     }
+    return;
 }
 
 sub print_course_selection_page {
@@ -195,31 +196,49 @@ sub print_course_selection_page {
     &print_header($r,$type);
 
 # Criteria for course search 
-    my $filterlist = ['descriptfilter',
-                      'instcodefilter','ownerfilter',
-                      'ownerdomfilter','coursefilter'];
-    my %filter;
+    my ($filterlist,$filter) = &get_filters();
     my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');
     my ($numtitles,@codetitles);
-    $r->print(&Apache::lonpickcourse::js_changer());
+    $r->print(&Apache::loncommon::js_changer());
     $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
-    $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                                       undef,undef,\%filter,$action,\$numtitles,
-                                       undef,undef,undef,undef,\@codetitles));
-    $filter{'domainfilter'} = $dom;
-    my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
-                                                         \%filter,$numtitles,undef,
-                                                         undef,undef,\@codetitles);
+    $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
+                                                \$numtitles,'modifycourse',undef,undef,undef,
+                                                \@codetitles,$dom,$env{'form.form'}));
+    my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
+                                                     undef,undef,undef,\@codetitles);
     &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
                                                     %courses);
     return;
 }
 
+sub get_filters {
+    my ($dom) = @_;
+    my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',
+                      'ownerdomfilter','coursefilter','sincefilter');
+    # created filter
+    my $loncaparev = &Apache::lonnet::get_server_loncaparev($dom);
+    if ($loncaparev ne 'unknown_cmd') {
+        push(@filterlist,'createdfilter');
+    }
+    my %filter;
+    foreach my $item (@filterlist) {
+        $filter{$item} = $env{'form.'.$item};
+    }
+    return (\@filterlist,\%filter);
+}
+
 sub print_modification_menu {
-    my ($r,$cdesc,$domdesc,$dom,$type) = @_;
+    my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
     &print_header($r,$type);
-    my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text);
+    my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
+        $cdom,$cnum);
+    if (ref($coursehash) eq 'HASH') {
+        $cdom = $coursehash->{'domain'};
+        $cnum = $coursehash->{'num'};
+    } else {
+         ($cdom,$cnum) = split(/_/,$cid);
+    }
     if ($type eq 'Community') {
         $ccrole = 'co';
     } else {
@@ -236,9 +255,9 @@ sub print_modification_menu {
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
         $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
         if (&showcredits($dom)) {
-            $setparams_text = 'View/Modify course owner, institutional code, and default authentication and credits';
+            $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
         } else {
-            $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
+            $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
         }
         $cat_text = 'View/Modify catalog settings for course';
     }
@@ -247,6 +266,17 @@ sub print_modification_menu {
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
     my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
 
+    sub manage_selfenrollment {
+        my ($cdom,$cnum,$type,$coursehash) = @_;
+        my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
+        if (ref($managed_by_dc) eq 'ARRAY') {
+            if (@{$managed_by_dc}) {
+                return 1;
+            } 
+        }
+        return 0;
+    }
+
     sub phaseurl {
         my $phase = shift;
         return "javascript:changePage(document.menu,'$phase')"
@@ -294,6 +324,14 @@ sub print_modification_menu {
                 icon => 'roles.png',
                 linktitle => ''
             },
+            {
+                linktext => 'View/Modify Self-Enrollment configuration',
+                icon => 'self_enroll.png',
+                #help => 'Course_Self_Enrollment',
+                url => &phaseurl('selfenroll'),
+                permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
+                linktitle => 'Configure user self-enrollment.',
+            },
         ]
         },
         );
@@ -310,16 +348,18 @@ sub print_modification_menu {
     }
     $menu_html .= '</p>'."\n".'<ul>';
     if ($type eq 'Community') {
-        $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>';
+        $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>'."\n".
+                      '<li>'.&mt('Override defaults for who configures self-enrollment for this specific community').'</li>'."\n";
     } else {
-        $menu_html .=  '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'.
-                       '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>';
+        $menu_html .=  '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n".
+                       '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>'."\n";
         if (&showcredits($dom)) {
-            $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>';
+            $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>'."\n";
         }
+        $menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
     }
-    $menu_html .= '<li>'.$setquota_text.'</li>'.
-                  '<li>'.$setuploadquota_text.'</li>'.
+    $menu_html .= '<li>'.$setquota_text.'</li>'."\n".
+                  '<li>'.$setuploadquota_text.'</li>'."\n".
                   '<li>'.$anon_text.'</li>'."\n";
     foreach my $item (@additional_params) {
         if ($type eq 'Community') {
@@ -409,9 +449,9 @@ sub print_settings_display {
               '<p>'.$lt{'cose'}.'<ul>'.
               '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>');
     if (&showcredits($cdom)) {
-        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication and credits[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
     } else {
-        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
     }
     $r->print('</li></ul></p>'.
               '<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
@@ -436,7 +476,7 @@ sub print_setquota {
                            coursequota   => 20,
                            uploadquota   => 500,
                          );
-    my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.instcode'],
+    my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.coursecode'],
                                         $cdom,$cnum);
     my $coursequota = $settings{'internal.coursequota'};
     my $uploadquota = $settings{'internal.uploadquota'};
@@ -445,13 +485,8 @@ sub print_setquota {
     }
     if ($uploadquota eq '') {
         my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
-        if ($type eq 'Community') {
-            $uploadquota = $domdefs{$lctype.'quota'};
-        } elsif ($settings{'internal.instcode'}) {
-            $uploadquota = $domdefs{'officialquota'};
-        } else {
-            $uploadquota = $domdefs{'unofficialquota'};
-        }
+        my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
+        $uploadquota = $domdefs{$quotatype.'quota'};
         if ($uploadquota eq '') {
             $uploadquota = $staticdefaults{'uploadquota'};
         }
@@ -599,7 +634,7 @@ sub print_catsettings {
 }
 
 sub print_course_modification_page {
-    my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+    my ($r,$cdom,$cnum,$cdesc,$crstype) = @_;
     my %lt=&Apache::lonlocal::texthash(
             'actv' => "Active",
             'inac' => "Inactive",
@@ -609,17 +644,28 @@ sub print_course_modification_page {
             'stus' => "Status",
             'nocc' => 'There is currently no owner set for this course.',
             'gobt' => "Save",
+            'sett' => 'Setting',
+            'domd' => 'Domain default',
+            'whom' => 'Who configures',  
     );
     my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
     my %enrollvar = &get_enrollment_settings($cdom,$cnum);
-    if ($type eq 'Community') {
+    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 = split(/,/,$settings{'internal.selfenrollmgrdc'});
+    my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'});
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+    my @default_managebydc = split(/,/,$domdefaults{$type.'selfenrolladmdc'});
+    if ($crstype eq 'Community') {
         $ccrole = 'co';
         $lt{'nocc'} = &mt('There is currently no owner set for this community.');
     } else {
         $ccrole ='cc';
         ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar);
     }
-    $ccname = &Apache::lonnet::plaintext($ccrole,$type);
+    $ccname = &Apache::lonnet::plaintext($ccrole,$crstype);
     my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]);
     my (@local_ccs,%cc_status,%pname);
     foreach my $item (keys(%roleshash)) {
@@ -672,14 +718,14 @@ sub print_course_modification_page {
         }
         $ownertable .= &Apache::loncommon::end_data_table();
     }
-    &print_header($r,$type,$javascript_validations);
+    &print_header($r,$crstype,$javascript_validations);
     my $dctitle = &Apache::lonnet::plaintext('dc');
-    my $mainheader = &modifiable_only_title($type);
+    my $mainheader = &modifiable_only_title($crstype);
     my $hidden_elements = &hidden_form_elements();
     $r->print('<form action="/adm/modifycourse" method="post" name="'.$env{'form.phase'}.'">'."\n".
               '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3><p>'.
               &Apache::lonhtmlcommon::start_pick_box());
-    if ($type eq 'Community') {
+    if ($crstype eq 'Community') {
         $r->print(&Apache::lonhtmlcommon::row_title(
                   &Apache::loncommon::help_open_topic('Modify_Community_Owner').
                   '&nbsp;'.&mt('Community Owner'))."\n");
@@ -687,7 +733,7 @@ sub print_course_modification_page {
         $r->print(&Apache::lonhtmlcommon::row_title(
                       &Apache::loncommon::help_open_topic('Modify_Course_Instcode').
                       '&nbsp;'.&mt('Course Code'))."\n".
-                  '<input type="text" size="10" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
+                  '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
                   &Apache::lonhtmlcommon::row_closure());
         if (&showcredits($cdom)) {
             $r->print(&Apache::lonhtmlcommon::row_title(
@@ -705,10 +751,59 @@ sub print_course_modification_page {
                    &Apache::loncommon::help_open_topic('Modify_Course_Owner').
                       '&nbsp;'.&mt('Course Owner'))."\n");
     }
-    $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1).
+    my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked);
+    my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
+    if ($type eq 'Community') {
+        $cctitle = &mt('Community personnel');
+    } else {
+        $cctitle = &mt('Course personnel');
+    }
+
+    $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure().
+              &Apache::lonhtmlcommon::row_title(
+              &Apache::loncommon::help_open_topic('Modify_Course_Selfenrolladmin').
+                  '&nbsp;'.&mt('Self-enrollment configuration')).
+              &Apache::loncommon::start_data_table()."\n".
+              &Apache::loncommon::start_data_table_header_row()."\n".
+              '<th>'.$lt{'sett'}.'</th>'.
+              '<th>'.$lt{'domd'}.'</th>'.
+              '<th>'.$lt{'whom'}.'</th>'.
+              &Apache::loncommon::end_data_table_header_row()."\n");
+    my %optionname;
+    $optionname{''} = &mt('Use domain default'); 
+    $optionname{'0'} = $dctitle;
+    $optionname{'1'} = $cctitle;
+    foreach my $item (@{$selfenrollrows}) {
+        my %checked;
+        my $default = $cctitle;
+        if (grep(/^\Q$item\E$/,@default_managebydc)) {
+            $default = $dctitle;
+        }
+        if (grep(/^\Q$item\E$/,@specific_managebydc)) {
+            $checked{'0'} = ' checked="checked"';
+        } elsif (grep(/^\Q$item\E$/,@specific_managebycc)) {
+            $checked{'1'} = ' checked="checked"';
+        } else {
+            $checked{''} = ' checked="checked"';
+        } 
+        $r->print(&Apache::loncommon::start_data_table_row()."\n".
+                 '<td>'.$selfenrolltitles->{$item}.'</td>'."\n".
+                 '<td>'.&mt('[_1] configures',$default).'</td>'."\n".
+                 '<td>');
+        foreach my $option ('','0','1') {  
+            $r->print('<span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="selfenrollmgr_'.$item.'" '.
+                      'value="'.$option.'"'.$checked{$option}.' />'.
+                      $optionname{$option}.'</label></span><br />');
+        }
+        $r->print('</td>'."\n".
+                  &Apache::loncommon::end_data_table_row()."\n");
+    }
+    $r->print(&Apache::loncommon::end_data_table()."\n".
+              '<br />'.&Apache::lonhtmlcommon::row_closure(1).
               &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements.
               '<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
-    if ($type eq 'Community') {
+    if ($crstype eq 'Community') {
         $r->print('this.form.submit();"');
     } else {
         $r->print('javascript:verify_message(this.form);"');
@@ -717,6 +812,62 @@ sub print_course_modification_page {
     return;
 }
 
+sub print_selfenrollconfig {
+    my ($r,$type,$cdesc,$coursehash) = @_;
+    return unless(ref($coursehash) eq 'HASH');
+    my $cnum = $coursehash->{'num'};
+    my $cdom = $coursehash->{'domain'};
+    my %currsettings = &get_selfenroll_settings($coursehash);
+    &print_header($r,$type);
+    $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
+              '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
+    &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
+                                                  $cdom,$cnum,\%currsettings,
+                                                  &hidden_form_elements());
+    return;
+}
+
+sub modify_selfenrollconfig {
+    my ($r,$type,$cdesc,$coursehash) = @_;
+    return unless(ref($coursehash) eq 'HASH');
+    my $cnum = $coursehash->{'num'};
+    my $cdom = $coursehash->{'domain'};
+    my %currsettings = &get_selfenroll_settings($coursehash);
+    &print_header($r,$type);
+    $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
+             '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
+    $r->print('<form action="/adm/modifycourse" method="post" name="selfenroll">'."\n".
+              &hidden_form_elements().'<br />');
+    &Apache::loncreateuser::update_selfenroll_config($r,$env{'form.pickedcourse'},
+                                                     $cdom,$cnum,'domain',$type,\%currsettings);
+    $r->print('</form>');
+    return;
+}
+
+sub get_selfenroll_settings {
+    my ($coursehash) = @_;
+    my %currsettings;
+    if (ref($coursehash) eq 'HASH') {
+        %currsettings = (
+            selfenroll_types              => $coursehash->{'internal.selfenroll_types'},
+            selfenroll_registered         => $coursehash->{'internal.selfenroll_registered'},
+            selfenroll_section            => $coursehash->{'internal.selfenroll_section'},
+            selfenroll_notifylist         => $coursehash->{'internal.selfenroll_notifylist'},
+            selfenroll_approval           => $coursehash->{'internal.selfenroll_approval'},
+            selfenroll_limit              => $coursehash->{'internal.selfenroll_limit'},
+            selfenroll_cap                => $coursehash->{'internal.selfenroll_cap'},
+            selfenroll_start_date         => $coursehash->{'internal.selfenroll_start_date'},
+            selfenroll_end_date           => $coursehash->{'internal.selfenroll_end_date'},
+            selfenroll_start_access       => $coursehash->{'internal.selfenroll_start_access'},
+            selfenroll_end_access         => $coursehash->{'internal.selfenroll_end_access'},
+            default_enrollment_start_date => $coursehash->{'default_enrollment_start_date'},
+            default_enrollment_end_date   => $coursehash->{'default_enrollment_end_date'},
+            uniquecode                    => $coursehash->{'internal.uniquecode'},
+        );
+    }
+    return %currsettings;
+}
+
 sub modifiable_only_title {
     my ($type) = @_;
     my $dctitle = &Apache::lonnet::plaintext('dc');
@@ -770,7 +921,9 @@ sub modify_course {
     my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
     my %longtype = &course_settings_descrip($type);
     my @items = ('internal.courseowner','description','internal.co-owners',
-                 'internal.pendingco-owners');
+                 'internal.pendingco-owners','internal.selfenrollmgrdc',
+                 'internal.selfenrollmgrcc');
+    my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
     unless ($type eq 'Community') {
         push(@items,('internal.coursecode','internal.authtype','internal.autharg',
                      'internal.sectionnums','internal.crosslistings'));
@@ -845,9 +998,32 @@ sub modify_course {
             $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
             $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
         }
+    }
 
+    my @newmgrdc = ();
+    my @newmgrcc = ();
+    my @currmgrdc = split(/,/,$currattr{'selfenrollmgrdc'});
+    my @currmgrcc = split(/,/,$currattr{'selfenrollmgrcc'});
+
+    foreach my $item (@{$selfenrollrows}) {
+        if ($env{'form.selfenrollmgr_'.$item} eq '0') {
+            push(@newmgrdc,$item);
+        } elsif ($env{'form.selfenrollmgr_'.$item} eq '1') {
+            push(@newmgrcc,$item);
+        }
     }
 
+    $newattr{'selfenrollmgrdc'}=join(',',@newmgrdc);
+    $newattr{'selfenrollmgrcc'}=join(',',@newmgrcc);
+
+    my $cctitle;
+    if ($type eq 'Community') {
+        $cctitle = &mt('Community personnel');
+    } else {
+        $cctitle = &mt('Course personnel');
+    }
+    my $dctitle = &Apache::lonnet::plaintext('dc');
+
     if ( exists($env{'form.courseowner'}) ) {
         $newattr{'courseowner'}=$env{'form.courseowner'};
         unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
@@ -881,10 +1057,10 @@ sub modify_course {
         }
     }
     if (@changes > 0) {
-        $chgresponse = &mt("The following settings have been changed:<br/><ul>");
+        $chgresponse = &mt('The following settings have been changed:').'<br/><ul>';
     }
     if (@nochanges > 0) {
-        $nochgresponse = &mt("The following settings remain unchanged:<br/><ul>");
+        $nochgresponse = &mt('The following settings remain unchanged:').'<br/><ul>';
     }
     if (@changes > 0) {
         my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
@@ -898,11 +1074,32 @@ sub modify_course {
             }
             $response .= '<br/>'.&mt('Error: ').$putreply.'</p>';
         } else {
+            if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
+                my %newenv;
+                map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;   
+                &Apache::lonnet::appenv(\%newenv);
+            }
             foreach my $attr (@modifiable_params) {
                 if (grep/^\Q$attr\E$/,@changes) {
-	            $chgresponse .= '<li>'.$longtype{$attr}.' '.&mt('now set to:').' "'.$newattr{$attr}.'".</li>';
+                    my $shown = $newattr{$attr};
+                    if ($attr eq 'selfenrollmgrdc') {
+                        $shown = &selfenroll_config_status(\@newmgrdc,$selfenrolltitles);
+                    } elsif ($attr eq 'selfenrollmgrcc') {
+                        $shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles);
+                    } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
+                        $shown = &mt('None');
+                    }
+                    $chgresponse .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
                 } else {
-	            $nochgresponse .= '<li>'.$longtype{$attr}.' '.&mt('still set to:').' "'.$currattr{$attr}.'".</li>';
+                    my $shown = $currattr{$attr};
+                    if ($attr eq 'selfenrollmgrdc') {
+                        $shown = &selfenroll_config_status(\@currmgrdc,$selfenrolltitles);
+                    } elsif ($attr eq 'selfenrollmgrcc') {
+                        $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
+                    } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
+                        $shown = &mt('None');
+                    }
+                    $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
                 }
             }
             if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
@@ -965,7 +1162,15 @@ sub modify_course {
         }
     } else {
         foreach my $attr (@modifiable_params) {
-            $nochgresponse .= '<li>'.$longtype{$attr}.' '.&mt('still set to').' "'.$currattr{$attr}.'".</li>';
+            my $shown = $currattr{$attr};
+            if ($attr eq 'selfenrollmgrdc') {
+                $shown = &selfenroll_config_status(\@currmgrdc,$selfenrolltitles);
+            } elsif ($attr eq 'selfenrollmgrcc') {
+                $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
+            } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
+                $shown = &mt('None');
+            }
+            $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
         }
     }
 
@@ -994,22 +1199,40 @@ sub modify_course {
     $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
              '<p>'.$reply.'</p>'."\n".
              '<form action="/adm/modifycourse" method="post" name="processparms">'.
-             &hidden_form_elements().
-             '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
-             &mt('Pick another action').'</a>';
+             &hidden_form_elements();
+    my @actions =
+        ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
+                 &mt('Pick another action').'</a>');
     if ($numwarnings) {
         my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
         my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
                                              '=1&destinationurl=/adm/populate','&<>"');
 
-        $reply .= '<br /><a href="'.$escuri.'">'.
-                  &mt('Go to Automated Enrollment Manager for course').'</a>';
+        push(@actions, '<a href="'.$escuri.'">'.
+                  &mt('Go to Automated Enrollment Manager for course').'</a>');
     }
-    $reply .= '</form>';
+    $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
     $r->print($reply);
     return;
 }
 
+sub selfenroll_config_status {
+    my ($items,$selfenrolltitles) = @_;
+    my $shown;
+    if ((ref($items) eq 'ARRAY') && (ref($selfenrolltitles) eq 'HASH')) {
+        if (@{$items} > 0) {
+            $shown = '<ul>';
+            foreach my $item (@{$items}) {
+                $shown .= '<li>'.$selfenrolltitles->{$item}.'</li>';
+            }
+            $shown .= '</ul>';
+        } else {
+            $shown = &mt('None');
+        }
+    }
+    return $shown;
+}
+
 sub update_coowners {
     my ($cdom,$cnum,$chome,$settings,$newattr) = @_;
     return unless ((ref($settings) eq 'HASH') && (ref($newattr) eq 'HASH'));
@@ -1238,10 +1461,10 @@ sub modify_quota {
                     }
                     $r->print('<p>');
                     if ($type eq 'Community') {
-                        $r->print(&mt('Disk usage [_1] exceeds the quota for this community.',$newoverquota).' '.
+                        $r->print(&mt("Disk usage $newoverquota exceeds the quota for this community.").' '.
                                   &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.'));
                     } else {
-                        $r->print(&mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.
+                        $r->print(&mt("Disk usage $newoverquota exceeds the quota for this course.").' '.
                                   &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.'));
                     }
                     $r->print('</p>');
@@ -1252,7 +1475,7 @@ sub modify_quota {
                               '<b>'.$updatedsettings{'internal.uploadquota'}.'</b>').'<br />');
             }
         } else {
-            $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content.').
+            $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content: ').
                       $putreply);
         }
     }
@@ -1295,6 +1518,12 @@ sub modify_anonsurvey_threshold {
                            );
                 my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
                                                     $cnum);
+                if ($putreply eq 'ok') {
+                    if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
+                        &Apache::lonnet::appenv(
+                           {'course.'.$cdom.'_'.$cnum.'.internal.anonsurvey_threshold' => $env{'form.threshold'}});
+                    }
+                }
                 if (($oldsettings{'internal.anonsurvey_threshold'} eq '') &&
                     ($env{'form.threshold'} == $defaultthreshold)) {
                     $r->print(&mt('The responder threshold for display of anonymous survey submissions is the default for this domain: [_1].',$defaultthreshold));
@@ -1405,6 +1634,13 @@ sub modify_catsettings {
             if (@changes > 0) {
                 my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
                 if ($putreply eq 'ok') {
+                    if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
+                        my %newenvhash;
+                        foreach my $item (@changes) {
+                            $newenvhash{'course.'.$cdom.'_'.$cnum.'.'.$item} = $cenv{$item};
+                        }
+                        &Apache::lonnet::appenv(\%newenvhash);
+                    }
                     my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
                                                                 $cnum,undef,undef,'.');
                     if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
@@ -1536,7 +1772,7 @@ ENDSCRIPT
                      };
     } elsif ($phase eq 'courselist') {
         $starthash = {
-           add_entries => {'onload' => "hide_searching();"},
+           add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
                      };
     }
     $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
@@ -1559,38 +1795,35 @@ sub print_footer {
 }
 
 sub check_course {
-    my ($r,$dom,$domdesc) = @_;
-    my ($ok_course,$description,$instcode,$owner);
-    my %args = (
-                 one_time => 1,
-               );
-    my %coursehash = 
-        &Apache::lonnet::coursedescription($env{'form.pickedcourse'},\%args);
-    my $cnum = $coursehash{'num'};
-    my $cdom = $coursehash{'domain'};
-    if ($cdom eq $dom) {
-        my $description;
-        my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
-                                                      $cnum,undef,undef,'.');
-        if (keys(%courseIDs) > 0) {
-            $ok_course = 'ok';
-            my ($instcode,$owner);
-            if (ref($courseIDs{$cdom.'_'.$cnum}) eq 'HASH') {
-                $description = $courseIDs{$cdom.'_'.$cnum}{'description'};
-                $instcode = $courseIDs{$cdom.'_'.$cnum}{'inst_code'};
-                $owner = $courseIDs{$cdom.'_'.$cnum}{'owner'};          
-            } else {
-                ($description,$instcode,$owner) = 
-                                   split(/:/,$courseIDs{$cdom.'_'.$cnum});
-            }
-            $description = &unescape($description);
-            $instcode = &unescape($instcode);
-            if ($instcode) {
-                $description .= " ($instcode)";
+    my ($dom,$domdesc) = @_;
+    my ($ok_course,$description,$instcode);
+    my %coursehash;
+    if ($env{'form.pickedcourse'} =~ /^$match_domain\_$match_courseid$/) {
+        my %args;
+        unless ($env{'course.'.$env{'form.pickedcourse'}.'.description'}) {
+            %args = (
+                      'one_time'      => 1,
+                      'freshen_cache' => 1,
+                    );
+        }
+        %coursehash =
+           &Apache::lonnet::coursedescription($env{'form.pickedcourse'},\%args);
+        my $cnum = $coursehash{'num'};
+        my $cdom = $coursehash{'domain'};
+        $description = $coursehash{'description'};
+        $instcode = $coursehash{'internal.coursecode'};
+        if ($instcode) {
+            $description .= " ($instcode)";
+        }
+        if (($cdom eq $dom) && ($cnum =~ /^$match_courseid$/)) {
+            my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
+                                                          $cnum,undef,undef,'.');
+            if ($courseIDs{$cdom.'_'.$cnum}) {
+                $ok_course = 'ok';
             }
-            return ($ok_course,$description);
         }
     }
+    return ($ok_course,$description,\%coursehash);
 }
 
 sub course_settings_descrip {
@@ -1598,8 +1831,10 @@ sub course_settings_descrip {
     my %longtype;
     if ($type eq 'Community') {
          %longtype = &Apache::lonlocal::texthash(
-                      'courseowner' => "Username:domain of community owner",
-                      'co-owners'   => "Username:domain of each co-owner",
+                      'courseowner'      => "Username:domain of community owner",
+                      'co-owners'        => "Username:domain of each co-owner",
+                      'selfenrollmgrdc'  => "Community-specific self-enrollment configuration by Domain Coordinator",
+                      'selfenrollmgrcc'  => "Community-specific self-enrollment configuration by Community personnel",
          );
     } else {
          %longtype = &Apache::lonlocal::texthash(
@@ -1617,7 +1852,10 @@ sub course_settings_descrip {
                       'notifylist' => 'Course Coordinators to be notified of enrollment changes',
                       'sectionnums' => 'Course section number:LON-CAPA section',
                       'crosslistings' => 'Crosslisted class:LON-CAPA section',
-                      'defaultcredits' => 'Credits', 
+                      'defaultcredits' => 'Credits',
+                      'selfenrollmgrdc'  => "Course-specific self-enrollment configuration by Domain Coordinator",
+                      'selfenrollmgrcc'  => "Course-specific self-enrollment configuration by Course personnel",
+
          );
     }
     return %longtype;
@@ -1628,7 +1866,8 @@ sub hidden_form_elements {
       &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
           'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
           'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
-          'threshold','defaultcredits','uploadquota'])."\n".
+          'threshold','defaultcredits','uploadquota','selfenrollmgrdc','selfenrollmgrcc',
+          'action','state','currsec_st','sections','newsec'],['^selfenrollmgr_'])."\n".
           '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
     return $hidden_elements;
 }
@@ -1636,7 +1875,7 @@ sub hidden_form_elements {
 sub showcredits {
     my ($dom) = @_;
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+    if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) {
         return 1;
     }
 }
@@ -1648,8 +1887,10 @@ sub handler {
         $r->send_http_header;
         return OK;
     }
+
     my $dom = $env{'request.role.domain'};
     my $domdesc = &Apache::lonnet::domain($dom,'description');
+
     if (&Apache::lonnet::allowed('ccc',$dom)) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
@@ -1688,7 +1929,7 @@ sub handler {
             if ($phase eq 'courselist') {
                 &print_course_selection_page($r,$dom,$domdesc);
             } else {
-                my ($checked,$cdesc) = &check_course($r,$dom,$domdesc);
+                my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
                 if ($checked eq 'ok') {
                     my $enter_text;
                     if ($type eq 'Community') {
@@ -1700,7 +1941,8 @@ sub handler {
                         &Apache::lonhtmlcommon::add_breadcrumb
                         ({href=>"javascript:changePage(document.$phase,'menu')",
                           text=>"Pick action"});
-                        &print_modification_menu($r,$cdesc,$domdesc,$dom,$type);
+                        &print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
+                                                 $env{'form.pickedcourse'},$coursehash);
                     } elsif ($phase eq 'ccrole') {
                         &Apache::lonhtmlcommon::add_breadcrumb
                          ({href=>"javascript:changePage(document.$phase,'ccrole')",
@@ -1769,14 +2011,26 @@ sub handler {
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
                             &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+                        } elsif ($phase eq 'selfenroll') {
+                            &Apache::lonhtmlcommon::add_breadcrumb
+                            ({href => "javascript:changePage(document.$phase,'$phase')",
+                              text => "Self-enrollment settings"});
+                            if (!exists($env{'form.state'})) {
+                                &print_selfenrollconfig($r,$type,$cdesc,$coursehash);
+                            } elsif ($env{'form.state'} eq 'done') {
+                                &Apache::lonhtmlcommon::add_breadcrumb 
+                                ({href=>"javascript:changePage(document.$phase,'$phase')",
+                                  text=>"Result"});
+                                &modify_selfenrollconfig($r,$type,$cdesc,$coursehash);
+                            }
                         }
                     }
                 } else {
                     $r->print('<span class="LC_error">');
                     if ($type eq 'Community') {
-                        $r->print(&mt('The course you selected is not a valid course in this domain'));
-                    } else {
                         $r->print(&mt('The community you selected is not a valid community in this domain'));
+                    } else {
+                        $r->print(&mt('The course you selected is not a valid course in this domain'));
                     }
                     $r->print(" ($domdesc)</span>");
                 }