--- loncom/interface/lonmodifycourse.pm	2008/10/27 14:32:30	1.40
+++ loncom/interface/lonmodifycourse.pm	2015/06/09 21:22:56	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.40 2008/10/27 14:32:30 bisitz Exp $
+# $Id: lonmodifycourse.pm,v 1.78 2015/06/09 21:22:56 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,24 +34,50 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonuserutils;
+use Apache::loncreateuser;
 use Apache::lonpickcourse;
-use LONCAPA::Enrollment;
 use lib '/home/httpd/lib/perl';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub get_dc_settable {
-    return ('courseowner','coursecode','authtype','autharg');
+    my ($type,$cdom) = @_;
+    if ($type eq 'Community') {
+        return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
+    } else {
+        my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
+        if (&showcredits($cdom)) {
+            push(@items,'defaultcredits');
+        }
+        return @items;
+    }
+}
+
+sub autoenroll_keys {
+    my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
+                     'autoadds','autodrops','autostart','autoend','sectionnums',
+                     'crosslistings','co-owners'];
+    my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
+    return ($internals,$accessdates);
 }
 
 sub catalog_settable {
-    my ($confhash) = @_;
+    my ($confhash,$type) = @_;
     my @settable;
     if (ref($confhash) eq 'HASH') {
-        if ($confhash->{'togglecats'} ne 'crs') {
-            push(@settable,'togglecats');
-        }
-        if ($confhash->{'categorize'} ne 'crs') {
-            push(@settable,'categorize');
+        if ($type eq 'Community') {
+            if ($confhash->{'togglecatscomm'} ne 'comm') {
+                push(@settable,'togglecats');
+            }
+            if ($confhash->{'categorizecomm'} ne 'comm') {
+                push(@settable,'categorize');
+            }
+        } else {
+            if ($confhash->{'togglecats'} ne 'crs') {
+                push(@settable,'togglecats');
+            }
+            if ($confhash->{'categorize'} ne 'crs') {
+                push(@settable,'categorize');
+            }
         }
     } else {
         push(@settable,('togglecats','categorize'));
@@ -61,14 +87,17 @@ sub catalog_settable {
 
 sub get_enrollment_settings {
     my ($cdom,$cnum) = @_;
-    my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum);
+    my ($internals,$accessdates) = &autoenroll_keys();
+    my @items;
+    if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) { 
+        @items = map { 'internal.'.$_; } (@{$internals});
+        push(@items,@{$accessdates});
+    }
+    my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
     my %enrollvar;
     $enrollvar{'autharg'} = '';
     $enrollvar{'authtype'} = '';
-    my %lt=&Apache::lonlocal::texthash(
-            'noen' => "No end date",
-    );
-    foreach my $item (keys %settings) {
+    foreach my $item (keys(%settings)) {
         if ($item =~ m/^internal\.(.+)$/) {
             my $type = $1;
             if ( ($type eq "autoadds") || ($type eq "autodrops") ) {
@@ -79,17 +108,23 @@ sub get_enrollment_settings {
                 }
             } elsif ( ($type eq "autostart") || ($type eq "autoend") ) {
                 if ( ($type eq "autoend") && ($settings{$item} == 0) ) {
-                    $enrollvar{$type} = $lt{'noen'};
+                    $enrollvar{$type} = &mt('No end date');
                 } else {
-                    $enrollvar{$type} = localtime($settings{$item});
+                    $enrollvar{$type} = &Apache::lonlocal::locallocaltime($settings{$item});
                 }
-            } elsif ($type eq "sectionnums") {
+            } elsif (($type eq 'sectionnums') || ($type eq 'co-owners')) {
                 $enrollvar{$type} = $settings{$item};
                 $enrollvar{$type} =~ s/,/, /g;
             } elsif ($type eq "authtype"
                      || $type eq "autharg"    || $type eq "coursecode"
                      || $type eq "crosslistings") {
                 $enrollvar{$type} = $settings{$item};
+            } elsif ($type eq 'defaultcredits') {
+                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};
@@ -102,11 +137,11 @@ sub get_enrollment_settings {
         } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
             my $type = $1;
             if ( ($type eq 'end') && ($settings{$item} == 0) ) {
-                $enrollvar{$item} = $lt{'noen'};
+                $enrollvar{$item} = &mt('No end date');
             } elsif ( ($type eq 'start') && ($settings{$item} eq '') ) {
                 $enrollvar{$item} = 'When enrolled';
             } else {
-                $enrollvar{$item} = localtime($settings{$item});
+                $enrollvar{$item} = &Apache::lonlocal::locallocaltime($settings{$item});
             }
         }
     }
@@ -115,114 +150,257 @@ sub get_enrollment_settings {
 
 sub print_course_search_page {
     my ($r,$dom,$domdesc) = @_;
-    &print_header($r);
-    my $filterlist = ['descriptfilter',
-                      'instcodefilter','ownerfilter',
-                      'ownerdomfilter','coursefilter'];
-    my $filter = {};
-    my $type = 'Course';
     my $action = '/adm/modifycourse';
-    my $cctitle = &Apache::lonnet::plaintext('cc',$type);
-    my $dctitle = &Apache::lonnet::plaintext('dc');
-    $r->print(
-        '<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>'.
-        &mt('Actions available after searching for a course:').'<ul>'.  
-        '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
-        '<li>'.&mt('View or modify course settings which only a [_1] may modify.'
-                  ,$dctitle).'</li>'."\n".'</ul>');
-    $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                             undef,undef,$filter,$action,'modifycourse'));
+    my $type = $env{'form.type'};
+    if (!defined($env{'form.type'})) {
+        $type = 'Course';
+    }
+    &print_header($r,$type);
+    my ($filterlist,$filter) = &get_filters($dom);
+    my ($numtitles,$cctitle,$dctitle,@codetitles);
+    my $ccrole = 'cc';
+    if ($type eq 'Community') {
+        $ccrole = 'co';
+    }
+    $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
+    $dctitle = &Apache::lonnet::plaintext('dc');
+    $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::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".
+                  '<li>'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
+                  '</li>'."\n".'</ul>');
+    } else {
+        $r->print(&mt('Actions available after searching for a course:').'<ul>'.
+                  '<li>'.&mt('Enter the course with the role of [_1]',$cctitle).'</li>'."\n".
+                  '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
+                  '</li>'."\n".'</ul>');
+    }
+    return;
 }
 
 sub print_course_selection_page {
     my ($r,$dom,$domdesc) = @_;
-    &print_header($r);
-
-# Criteria for course search 
-    my $filterlist = ['descriptfilter',
-                      'instcodefilter','ownerfilter',
-                      'ownerdomfilter','coursefilter'];
-    my %filter;
     my $type = $env{'form.type'};
-    if ($type eq '') {
+    if (!defined($type)) {
         $type = 'Course';
     }
+    &print_header($r,$type);
+
+# Criteria for course search 
+    my ($filterlist,$filter) = &get_filters();
     my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');
-    $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br /><br />');
-    $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                                       undef,undef,\%filter,$action));
-    $filter{'domainfilter'} = $dom;
-    my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
-                                                         \%filter);
-    &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,
-                                                    %courses);
+    my ($numtitles,@codetitles);
+    $r->print(&Apache::loncommon::js_changer());
+    $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
+    $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,
+                                                    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) = @_;
-    &print_header($r,$cdesc);
-    my $type = 'Course';
-    my $action = '/adm/modifycourse';
-    my $cctitle = &Apache::lonnet::plaintext('cc',$type);
-    my $dctitle = &Apache::lonnet::plaintext('dc');
-    my %lt=&Apache::lonlocal::texthash(
-                    'some' => "Certain settings which control auto-enrollment of students from your institution's student information system.",
-                    'crqo' => 'The total disk space allocated for storage of portfolio files in all groups in a course.',
-    );
+    my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
+    &print_header($r,$type);
+    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 {
+        $ccrole = 'cc';
+    }
+    if ($type eq 'Community') {
+        $categorytitle = 'View/Modify Community Settings';
+        $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
+        $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); 
+        $setparams_text = 'View/Modify community owner';
+        $cat_text = 'View/Modify catalog settings for community';
+    } else {
+        $categorytitle = 'View/Modify Course Settings';
+        $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, default authentication, credits, and self-enrollment';
+        } else {
+            $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
+        }
+        $cat_text = 'View/Modify catalog settings for course';
+    }
+    my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.');
+    my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.'); 
+
+    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')"
+    }
     my @menu =
-        (
-          { text  => 'Modify quota for group portfolio files',
-            phase => 'setquota',
+        ({  categorytitle => $categorytitle,
+        items => [
+            {
+                linktext => $setparams_text,
+                url => &phaseurl('setparms'),
+                permission => 1,
+                #help => '',
+                icon => 'crsconf.png',
+                linktitle => ''
             },
-          { text  => 'Display current settings for automated enrollment',
-            phase => 'viewparms',
+            {
+                linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
+                url => &phaseurl('setquota'),
+                permission => 1,
+                #help => '',
+                icon => 'groupportfolioquota.png',
+                linktitle => ''
             },
-          { text => 'Modify institutional code, course owner and/or default authentication',
-            phase => 'setparms',
-          },
-         );
-    my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
-    my @additional_params = &catalog_settable($domconf{'coursecategories'});
-    if (@additional_params > 0) {
-        push (@menu, { text => 'Modify course catalog settings for course',
-                       phase => 'catsettings',
-                     });
-    }
-    my $menu_html = '<h3>'.&mt('View/Modify settings for: ').$cdesc.'</h3>'."\n".
-              &mt('Although almost all course settings can be modified by a [_1], a number of settings exist which only a [_2] may change:',$cctitle,$dctitle).'
-<ul>
-  <li>'.$lt{'some'}.'</li>
-  <li>'.$lt{'crqo'}.'</li>'."\n";
+            {
+                linktext => 'View/Modify responders threshold for anonymous survey submissions display',
+                url => &phaseurl('setanon'),
+                permission => 1,
+                #help => '',
+                icon => 'anonsurveythreshold.png',
+                linktitle => ''
+            },
+            {
+                linktext => $cat_text,
+                url => &phaseurl('catsettings'),
+                permission => (@additional_params > 0),
+                #help => '',
+                icon => 'ccatconf.png',
+                linktitle => ''
+            },
+            {
+                linktext => 'Display current settings for automated enrollment',
+                url => &phaseurl('viewparms'),
+                permission => ($type ne 'Community'),
+                #help => '',
+                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.',
+            },
+            {
+                linktext => 'View/Modify submit button behavior, post-submission',
+                icon => 'emblem-readonly.png',
+                #help => '',
+                url => &phaseurl('setpostsubmit'),
+                permission => 1,
+                linktitle => '',
+            },
+        ]
+        },
+        );
+
+    my $menu_html =
+        '<h3>'
+       .&mt('View/Modify settings for: [_1]',
+                '<span class="LC_nobreak">'.$cdesc.'</span>')
+       .'</h3>'."\n".'<p>';
+    if ($type eq 'Community') {
+        $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
+    } else {
+        $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
+    }
+    $menu_html .= '</p>'."\n".'<ul>';
+    if ($type eq 'Community') {
+        $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>'."\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>'."\n";
+        }
+        $menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
+    }
+    $menu_html .= '<li>'.$setquota_text.'</li>'."\n".
+                  '<li>'.$setuploadquota_text.'</li>'."\n".
+                  '<li>'.$anon_text.'</li>'."\n".
+                  '<li>'.$postsubmit_text.'</li>'."\n";
     foreach my $item (@additional_params) {
-        if ($item eq 'togglecats') {
-            $menu_html .= '  <li>'.&mt('Hiding a course from the course catalog (can be [_1]configured[_2] to be modifiable in course context)','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
-        } elsif ($item eq 'categorize') {
-            $menu_html .= '  <li>'.&mt('Manual cataloging of a course (can be [_1]configured[_2] to be modifiable in course context)','<a href="/adm/domainprefs?actions=coursecategories&phase=display">','</a>').'</li>'."\n";
-
+        if ($type eq 'Community') {
+            if ($item eq 'togglecats') {
+                $menu_html .= '  <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
+            } elsif ($item eq 'categorize') {
+                $menu_html .= '  <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
+            }
+        } else {
+            if ($item eq 'togglecats') {
+                $menu_html .= '  <li>'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
+            } elsif ($item eq 'categorize') {
+                $menu_html .= '  <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">','</a>').'</li>'."\n";
+            }
         }
     }
-    $menu_html .= ' </ul>
-<form name="menu" method="post" action="'.$action.'" />'."\n".
-    &hidden_form_elements();
-
-    foreach my $menu_item (@menu) {
-        $menu_html.='<p>';
-        $menu_html.='<font size="+1">';
-        $menu_html.=
-                qq|<a href="javascript:changePage(document.menu,'$menu_item->{'phase'}')">|;
-        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        $menu_html.='</p>';
-    }
+    $menu_html .=
+        ' </ul>'
+       .'<form name="menu" method="post" action="/adm/modifycourse">'
+       ."\n"
+       .&hidden_form_elements();
     
     $r->print($menu_html);
+    $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+    $r->print('</form>');
     return;
 }
 
 sub print_ccrole_selected {
-    my ($r,$cdesc,$domdesc) = @_;
-    &print_header($r);
+    my ($r,$type) = @_;
+    &print_header($r,$type);
     my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
     $r->print('<form name="ccrole" method="post" action="/adm/roles">
 <input type="hidden" name="selectrole" value="1" />
@@ -233,85 +411,113 @@ sub print_ccrole_selected {
 sub print_settings_display {
     my ($r,$cdom,$cnum,$cdesc,$type) = @_;
     my %enrollvar = &get_enrollment_settings($cdom,$cnum);
-    my %longtype = &course_settings_descrip();
+    my %longtype = &course_settings_descrip($type);
     my %lt = &Apache::lonlocal::texthash(
-            'cset' => "Course setting",
-            'valu' => "Current value",
-            'caes' => 'Current automated enrollment settings for ',
-            'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:",
-            'cose' => "Course settings for LON-CAPA courses that control auto-enrollment based on classlist data available from your institution's student information system fall into two groups:",
-            'dcon' => "Modifiable by DC only",
-            'back' => "Back to options page",
+            'valu' => 'Current value',
+            'cour' => 'Current settings are:',
+            'cose' => "Settings which control auto-enrollment using classlists from your institution's student information system fall into two groups:",
+            'dcon' => 'Modifiable only by Domain Coordinator',
+            'back' => 'Pick another action',
     );
-
-    my @bgcolors = ('#eeeeee','#cccccc');
-    my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+    my $ccrole = 'cc';
+    if ($type eq 'Community') {
+       $ccrole = 'co';
+    }
+    my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     my $dctitle = &Apache::lonnet::plaintext('dc');
-    my @modifiable_params = &get_dc_settable();
-
+    my @modifiable_params = &get_dc_settable($type,$cdom);
+    my ($internals,$accessdates) = &autoenroll_keys();
+    my @items;
+    if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
+        @items =  (@{$internals},@{$accessdates});
+    }
     my $disp_table = &Apache::loncommon::start_data_table()."\n".
                      &Apache::loncommon::start_data_table_header_row()."\n".
-                     "<th>$lt{'cset'}</th>\n".
+                     "<th>&nbsp;</th>\n".
                      "<th>$lt{'valu'}</th>\n".
                      "<th>$lt{'dcon'}</th>\n".
                      &Apache::loncommon::end_data_table_header_row()."\n";
-    foreach my $key (sort(keys(%enrollvar))) {
+    foreach my $item (@items) {
         $disp_table .= &Apache::loncommon::start_data_table_row()."\n".
-                 "<td>$longtype{$key}</td>\n".
-                 "<td>$enrollvar{$key}</td>\n";
-        if (grep(/^\Q$key\E$/,@modifiable_params)) {
-            $disp_table .= '<td>'.&mt('Yes').'</td>'."\n"; 
+                       "<td><b>$longtype{$item}</b></td>\n".
+                       "<td>$enrollvar{$item}</td>\n";
+        if (grep(/^\Q$item\E$/,@modifiable_params)) {
+            $disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n";
         } else {
-            $disp_table .= '<td>'.&mt('No').'</td>'."\n";
+            $disp_table .= '<td align="right">'.&mt('No').'</td>'."\n";
         }
         $disp_table .= &Apache::loncommon::end_data_table_row()."\n";
     }
     $disp_table .= &Apache::loncommon::end_data_table()."\n";
-    &print_header($r,$cdesc);
-    $r->print('
-<h3>'.$lt{'caes'}.'</h3>
-<p>
-<form action="/adm/modifycourse" method="post" name="viewparms">
-'.$lt{'cose'}.'<ul><li>'.&mt('Settings that can be modified by a [_1] using the <a href="/adm/populate">Automated Enrollment Manager</a>.',$cctitle).'</li><li>'.&mt('Settings that may only be modified by a [_1] from this menu.',$dctitle).'</li></ul>
-</p><p>
-'.$lt{'cour'}.'
-</p><p>
-'.$disp_table.'
-</p><p>
-<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="javascript:changePage(document.viewparms,'."'setparms'".')">'.&mt('Modify [_1]-only settings',$dctitle).'</a>'."\n".
-&hidden_form_elements().
-'</form>');
+    &print_header($r,$type);
+    my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+    my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+                                         '=1&destinationurl=/adm/populate','&<>"'); 
+    $r->print('<h3>'.&mt('Current automated enrollment settings for:').
+              ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.
+              '<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".
+              '<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, 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, 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>'.
+              '<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
+              &hidden_form_elements().
+              '</p></form>'
+     );
 }
 
 sub print_setquota {
     my ($r,$cdom,$cnum,$cdesc,$type) = @_;
-    my $dctitle = &Apache::lonnet::plaintext('dc');
-    my $cctitle = &Apache::lonnet::plaintext('cc',$type);
-    my $subdiv = &mt('Although a [_1] will assign the disk quota for each individual group, the size of the quota is constrained by the total disk space allocated by the [_2] for portfolio files in a course.',$cctitle,$dctitle);
+    my $lctype = lc($type);
+    my $headline = &mt("Set disk space quotas for $lctype: [_1]",
+                     '<span class="LC_nobreak">'.$cdesc.'</span>');
     my %lt = &Apache::lonlocal::texthash(
-                'cquo' => 'Disk space for storage of group portfolio files',
-                'gpqu' => 'Course portfolio files disk space',
-                'each' => 'Each course group can be assigned a quota for portfolio files uploaded to the group.',
-                'modi' => 'Modify quota',
-                'back' => "Back to options page",
+                'gpqu' => 'Disk space for storage of group portfolio files',
+                'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor',
+                'modi' => 'Save',
+                'back' => 'Pick another action',
     );
-    my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
+    my %staticdefaults = (
+                           coursequota   => 20,
+                           uploadquota   => 500,
+                         );
+    my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.coursecode'],
+                                        $cdom,$cnum);
     my $coursequota = $settings{'internal.coursequota'};
+    my $uploadquota = $settings{'internal.uploadquota'};
     if ($coursequota eq '') {
-        $coursequota = 20;
+        $coursequota = $staticdefaults{'coursequota'};
+    }
+    if ($uploadquota eq '') {
+        my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+        my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
+        $uploadquota = $domdefs{$quotatype.'quota'};
+        if ($uploadquota eq '') {
+            $uploadquota = $staticdefaults{'uploadquota'};
+        }
     }
-    &print_header($r,$cdesc);
+    &print_header($r,$type);
     my $hidden_elements = &hidden_form_elements();
+    my $porthelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota');
+    my $uploadhelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Upload_Quota');
     $r->print(<<ENDDOCUMENT);
-<form action="/adm/modifycourse" method="post" name="setquota">
-<h3>$lt{'cquo'}.</h3>
+<form action="/adm/modifycourse" method="post" name="setquota" onsubmit="return verify_quota();">
+<h3>$headline</h3>
+<p><span class="LC_nobreak">
+$porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> MB
+</span>
+<br />
+<span class="LC_nobreak">
+$uploadhelpitem $lt{'upqu'}: <input type="text" size="4" name="uploadquota" value="$uploadquota" /> MB
+</span>
+</p>
 <p>
-$lt{'each'}<br />
-$subdiv
-</p><p>
-$lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> Mb &nbsp;&nbsp;&nbsp;&nbsp;
-<input type="button" onClick="javascript:verify_quota(this.form)" value="$lt{'modi'}" />
+<input type="submit" value="$lt{'modi'}" />
 </p>
 $hidden_elements
 <a href="javascript:changePage(document.setquota,'menu')">$lt{'back'}</a>
@@ -320,16 +526,158 @@ ENDDOCUMENT
     return;
 }
 
+sub print_set_anonsurvey_threshold {
+    my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                'resp' => 'Responder threshold for anonymous survey submissions display:',
+                'sufa' => 'Anonymous survey submissions displayed when responders exceeds',
+                'modi' => 'Save',
+                'back' => 'Pick another action',
+    );
+    my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
+    my $threshold = $settings{'internal.anonsurvey_threshold'};
+    if ($threshold eq '') {
+        my %domconfig = 
+            &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+        if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+            $threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+            if ($threshold eq '') {
+                $threshold = 10;
+            }
+        } else {
+            $threshold = 10;
+        }
+    }
+    &print_header($r,$type);
+    my $hidden_elements = &hidden_form_elements();
+    my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
+    $r->print(<<ENDDOCUMENT);
+<form action="/adm/modifycourse" method="post" name="setanon" onsubmit="return verify_anon_threshold();">
+<h3>$lt{'resp'} <span class="LC_nobreak">$cdesc</span></h3>
+<p>
+$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" /> &nbsp;&nbsp;&nbsp;&nbsp;
+<input type="submit" value="$lt{'modi'}" />
+</p>
+$hidden_elements
+<a href="javascript:changePage(document.setanon,'menu')">$lt{'back'}</a>
+</form>
+ENDDOCUMENT
+    return;
+}
+
+sub print_postsubmit_config {
+    my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                'conf' => 'Configure submit button behavior after student makes a submission',
+                'disa' => 'Disable submit button/keypress following student submission',
+                'nums' => 'Number of seconds submit is disabled',
+                'modi' => 'Save',
+                'back' => 'Pick another action',
+                'yes'  => 'Yes',
+                'no'   => 'No',
+    );
+    my %settings = &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout',
+                                                       'internal.coursecode','internal.textbook'],$cdom,$cnum);
+    my $postsubmit = $settings{'internal.postsubmit'};
+    if ($postsubmit eq '') {
+        my %domconfig =
+            &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+        $postsubmit = 1; 
+        if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
+                    $postsubmit = 0; 
+                }
+            }
+        }
+    }
+    my ($checkedon,$checkedoff,$display);
+    if ($postsubmit) {
+        $checkedon = 'checked="checked"';
+        $display = 'block';
+    } else {
+        $checkedoff = 'checked="checked"';
+        $display = 'none';
+    }
+    my $postsubtimeout = $settings{'internal.postsubtimeout'};
+    my $default = &domain_postsubtimeout($cdom,$type,\%settings);
+    my $zero = &mt('(Enter 0 to disable until next page reload, or leave blank to use the domain default: [_1])',$default);
+    if ($postsubtimeout eq '') {
+        $postsubtimeout = $default;
+    }
+    &print_header($r,$type);
+    my $hidden_elements = &hidden_form_elements();
+    my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
+    $r->print(<<ENDDOCUMENT);
+<form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
+<h3>$lt{'conf'} <span class="LC_nobreak">($cdesc)</span></h3>
+<p>
+$helpitem $lt{'disa'}: 
+<label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" />
+$lt{'yes'}</label>&nbsp;&nbsp;
+<label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" />
+$lt{'no'}</label>
+<div id="studentsubmission" style="display: $display">
+$lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" /><br />
+$zero</div>
+<br />     
+<input type="submit" value="$lt{'modi'}" />
+</p>
+$hidden_elements
+<a href="javascript:changePage(document.setpostsubmit,'menu')">$lt{'back'}</a>
+</form>
+ENDDOCUMENT
+    return;
+}
+
+sub domain_postsubtimeout {
+    my ($cdom,$type,$settings) = @_;
+    return unless (ref($settings) eq 'HASH'); 
+    my $lctype = lc($type);
+    unless ($type eq 'Community') {
+        $lctype = 'unofficial';
+        if ($settings->{'internal.coursecode'}) {
+            $lctype = 'official';
+        } elsif ($settings->{'internal.textbook'}) {
+            $lctype = 'textbook';
+        }
+    }
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+    my $postsubtimeout = 60;
+    if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+        if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+            if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                if ($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$lctype} ne '') {
+                    $postsubtimeout = $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$lctype};
+                }
+            }
+        }
+    }
+    return $postsubtimeout;
+}
+
 sub print_catsettings {
-    my ($r,$cdom,$cnum,$cdesc) = @_;
-    &print_header($r,$cdesc);
+    my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+    &print_header($r,$type);
     my %lt = &Apache::lonlocal::texthash(
-                                         'back' => 'Back to options page',
+                                         'back'    => 'Pick another action',
+                                         'catset'  => 'Catalog Settings for Course',
+                                         'visi'    => 'Visibility in Course/Community Catalog',
+                                         'exclude' => 'Exclude from course catalog:',
+                                         'categ'   => 'Categorize Course',
+                                         'assi'    => 'Assign one or more categories and/or subcategories to this course.'
                                         );
+    if ($type eq 'Community') {
+        $lt{'catset'} = &mt('Catalog Settings for Community');
+        $lt{'exclude'} = &mt('Exclude from course catalog');
+        $lt{'categ'} = &mt('Categorize Community');
+        $lt{'assi'} = &mt('Assign one or more subcategories to this community.');
+    }
     $r->print('<form action="/adm/modifycourse" method="post" name="catsettings">'.
-              '<h3>'.&mt('Catalog Settings for Course').'</h3>');
+              '<h3>'.$lt{'catset'}.' <span class="LC_nobreak">'.$cdesc.'</span></h3>');
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
-    my @cat_params = &catalog_settable($domconf{'coursecategories'});
+    my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
     if (@cat_params > 0) {
         my %currsettings = 
             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
@@ -340,32 +688,46 @@ sub print_catsettings {
                 $excludeon = $excludeoff;
                 $excludeoff = ''; 
             }
-            $r->print('<h4>'.&mt('Visibility in Course Catalog').'</h4>'.
-                      &mt("Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies").':<ul>'.
-                      '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code').'</li>'.
-                      '<li>'.&mt('The course has been categorized into at least one of the course categories defined for the domain.').'</li></ul>'.
-                      &mt('Exclude from course catalog').'&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br />'); 
+            $r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
+                      $lt{'exclude'}.
+                      '&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br /><p>');
+            if ($type eq 'Community') {
+                $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
+            } else {
+                $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':<ul>'.
+                          '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'.
+                          '<li>'.&mt('The course has been categorized using at least one of the course categories defined for the domain.').'</li></ul>');
+            }
+            $r->print('</ul></p>');
         }
         if (grep(/^categorize$/,@cat_params)) {
-            $r->print('<h4>'.&mt('Categorize Course').'</h4>');
+            $r->print('<br /><h4>'.$lt{'categ'}.'</h4>');
             if (ref($domconf{'coursecategories'}) eq 'HASH') {
                 my $cathash = $domconf{'coursecategories'}{'cats'};
                 if (ref($cathash) eq 'HASH') {
-                    $r->print(&mt('Assign one or more categories to this course.').'<br /><br />'.
+                    $r->print($lt{'assi'}.'<br /><br />'.
                               &Apache::loncommon::assign_categories_table($cathash,
-                                                     $currsettings{'categories'}));
+                                                     $currsettings{'categories'},$type));
                 } else {
                     $r->print(&mt('No categories defined for this domain'));
                 }
             } else {
                 $r->print(&mt('No categories defined for this domain'));
             }
-            $r->print('<p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
+            unless ($type eq 'Community') { 
+                $r->print('<p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
+            }
         }
-        $r->print('<input type="button" name="chgcatsettings" value="'.
-                  &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" />');
+        $r->print('<p><input type="button" name="chgcatsettings" value="'.
+                  &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
     } else {
-        $r->print('<span class="LC_warning">'.&mt('Catalog settings in this domain are set in course context via "Set Course Environment".').'</span><br /><br />'."\n".
+        $r->print('<span class="LC_warning">');
+        if ($type eq 'Community') {
+            $r->print(&mt('Catalog settings in this domain are set in community context via "Community Configuration".'));
+        } else {
+            $r->print(&mt('Catalog settings in this domain are set in course context via "Course Configuration".'));
+        }
+        $r->print('</span><br /><br />'."\n".
                   '<a href="javascript:changePage(document.catsettings,'."'menu'".');">'.
                   $lt{'back'}.'</a>');
     }
@@ -374,103 +736,277 @@ sub print_catsettings {
 }
 
 sub print_course_modification_page {
-    my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_;
-    my %longtype = &course_settings_descrip();
-    my %enrollvar = &get_enrollment_settings($cdom,$cnum);
-    my $ownertable;
+    my ($r,$cdom,$cnum,$cdesc,$crstype) = @_;
     my %lt=&Apache::lonlocal::texthash(
             'actv' => "Active",
             'inac' => "Inactive",
-            'ccor' => "Course Coordinator",
-            'noen' => "No end date",
             'ownr' => "Owner",
             'name' => "Name",
             'unme' => "Username:Domain",
             'stus' => "Status",
-            'cquo' => "Disk space for storage of group portfolio files",
-            'gpqu' => "Course portfolio files disk space",
-            'each' => "Each course group can be assigned a quota for portfolio files uploaded to the group.",
-            'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ",
-            'aenm' => "Automated Enrollment Manager",
-            'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.",
-            'caes' => 'Current automated enrollment settings',
-            'cour' => "Course settings that control automated enrollment in this LON-CAPA course
-are currently:",
-            'nocc' => "There is currently no course owner set for this course. In addition, no active course coordinators from this LON-CAPA domain were found, so you will not be able assign a course owner.  If you wish to assign a course owner, it is recommended that you use the 'User Roles' screen to add a course coordinator with a LON-CAPA account in this domain to the course.",    
-            'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change
-all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).",
-            'ccod' => "Course Code",
-            'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.",
-            'cown' => "Course Owner",
-            'cous' => "The course owner is used in the retrieval of class lists from your institution's student information system when access to class lists data incorporates validation of instructor status.",
-            'tabl' => 'The table below contains a list of active course coordinators in this course, who are from this domain',
-            'usrd' => 'Use the radio buttons to select a different course owner.',
-            'deam' => "Default Authentication method",
-            'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the &lt;authtype&gt; and &lt;autharg&gt; properties for the new student. If you choose 'internally authenticated', and leave the initial password field empty, the automated enrollment process will create a randomized password for each new student account that it adds to your LON-CAPA domain.",
+            'nocc' => 'There is currently no owner set for this course.',
             'gobt' => "Save",
+            'sett' => 'Setting',
+            'domd' => 'Domain default',
+            'whom' => 'Who configures',  
     );
-    my @bgcolors = ('#eeeeee','#cccccc');
-
-    my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum);
-    my @local_ccs = ();
-    my %cc_status = ();
-    my %pname = ();
-    my $active_cc;
-    foreach my $person (@coursepersonnel) {
-        my ($role,$user) = split(/:/,$person,2);
-        $user =~ s/:$//;
-        if (($role eq 'cc') && ($user ne ''))  {
-            if (!grep(/^\Q$user\E$/,@local_ccs)) {
-                my ($ccname,$ccdom) = split(/:/,$user);
-                $active_cc = 
-                   &Apache::loncommon::check_user_status($ccdom,$ccname,$cdom,
-                                                         $cnum,'cc');
-                if ($active_cc eq 'active') {
-                    push(@local_ccs,$user);
-                    $pname{$user} = &Apache::loncommon::plainname($ccname,$ccdom);
-                    $cc_status{$user} = $lt{'actv'};
-                }
-            }
+    my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname);
+    my %enrollvar = &get_enrollment_settings($cdom,$cnum);
+    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,$crstype);
+    my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]);
+    my (@local_ccs,%cc_status,%pname);
+    foreach my $item (keys(%roleshash)) {
+        my ($uname,$udom) = split(/:/,$item);
+        if (!grep(/^\Q$uname\E:\Q$udom\E$/,@local_ccs)) {
+            push(@local_ccs,$uname.':'.$udom);
+            $pname{$uname.':'.$udom} = &Apache::loncommon::plainname($uname,$udom);
+            $cc_status{$uname.':'.$udom} = $lt{'actv'};
         }
     }
-    if ( (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs)) && 
-             ($enrollvar{'courseowner'} ne '') )  {
-        my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
+    if (($enrollvar{'courseowner'} ne '') && 
+        (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) {
         push(@local_ccs,$enrollvar{'courseowner'});
+        my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
         $pname{$enrollvar{'courseowner'}} = 
                          &Apache::loncommon::plainname($owneruname,$ownerdom);
-        $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
-                                                           $cdom,$cnum,'cc');
+        my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
+                                                              $cdom,$cnum,$ccrole);
         if ($active_cc eq 'active') {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};
         } else {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'};
         }
     }
-    my $numlocalcc = @local_ccs;
+    @local_ccs = sort(@local_ccs);
+    if (@local_ccs == 0) {
+        $ownertable = $lt{'nocc'};
+    } else {
+        my $numlocalcc = scalar(@local_ccs);
+        $ownertable = '<input type="hidden" name="numlocalcc" value="'.$numlocalcc.'" />'.
+                      &Apache::loncommon::start_data_table()."\n".
+                      &Apache::loncommon::start_data_table_header_row()."\n".
+                      '<th>'.$lt{'ownr'}.'</th>'.
+                      '<th>'.$lt{'name'}.'</th>'.
+                      '<th>'.$lt{'unme'}.'</th>'.
+                      '<th>'.$lt{'stus'}.'</th>'.
+                      &Apache::loncommon::end_data_table_header_row()."\n";
+        foreach my $cc (@local_ccs) {
+            $ownertable .= &Apache::loncommon::start_data_table_row()."\n";
+            if ($cc eq $enrollvar{'courseowner'}) {
+                  $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked" /></td>'."\n";
+            } else {
+                $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" /></td>'."\n";
+            }
+            $ownertable .= 
+                 '<td>'.$pname{$cc}.'</td>'."\n".
+                 '<td>'.$cc.'</td>'."\n".
+                 '<td>'.$cc_status{$cc}.' '.$ccname.'</td>'."\n".
+                 &Apache::loncommon::end_data_table_row()."\n";
+        }
+        $ownertable .= &Apache::loncommon::end_data_table();
+    }
+    &print_header($r,$crstype,$javascript_validations);
+    my $dctitle = &Apache::lonnet::plaintext('dc');
+    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 ($crstype eq 'Community') {
+        $r->print(&Apache::lonhtmlcommon::row_title(
+                  &Apache::loncommon::help_open_topic('Modify_Community_Owner').
+                  '&nbsp;'.&mt('Community Owner'))."\n");
+    } else {
+        $r->print(&Apache::lonhtmlcommon::row_title(
+                      &Apache::loncommon::help_open_topic('Modify_Course_Instcode').
+                      '&nbsp;'.&mt('Course Code'))."\n".
+                  '<input type="text" size="15" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
+                  &Apache::lonhtmlcommon::row_closure());
+        if (&showcredits($cdom)) {
+            $r->print(&Apache::lonhtmlcommon::row_title(
+                          &Apache::loncommon::help_open_topic('Modify_Course_Credithours').
+                      '&nbsp;'.&mt('Credits (students)'))."\n".
+                      '<input type="text" size="3" name="defaultcredits" value="'.$enrollvar{'defaultcredits'}.'" />'.
+                      &Apache::lonhtmlcommon::row_closure());
+         }
+         $r->print(&Apache::lonhtmlcommon::row_title(
+                       &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth').
+                       '&nbsp;'.&mt('Default Authentication method'))."\n".
+                   $authenitems."\n".
+                   &Apache::lonhtmlcommon::row_closure().
+                   &Apache::lonhtmlcommon::row_title(
+                   &Apache::loncommon::help_open_topic('Modify_Course_Owner').
+                      '&nbsp;'.&mt('Course Owner'))."\n");
+    }
+    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 ($crstype eq 'Community') {
+        $r->print('this.form.submit();"');
+    } else {
+        $r->print('javascript:verify_message(this.form);"');
+    }
+    $r->print(' value="'.$lt{'gobt'}.'" /></p></form>');
+    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');
+    if ($type eq 'Community') {
+        return &mt('Community settings modifiable only by [_1] for:',$dctitle);
+    } else {
+        return &mt('Course settings modifiable only by [_1] for:',$dctitle);
+    }
+}
 
-    my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses"));
+sub gather_authenitems {
+    my ($cdom,$enrollvar) = @_;
     my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom);
     my $curr_authtype = '';
     my $curr_authfield = '';
-    if ($enrollvar{'authtype'} =~ /^krb/) {
-        $curr_authtype = 'krb';
-    } elsif ($enrollvar{'authtype'} eq 'internal' ) {
-        $curr_authtype = 'int';
-    } elsif ($enrollvar{'authtype'} eq 'localauth' ) {
-        $curr_authtype = 'loc';
+    if (ref($enrollvar) eq 'HASH') {
+        if ($enrollvar->{'authtype'} =~ /^krb/) {
+            $curr_authtype = 'krb';
+        } elsif ($enrollvar->{'authtype'} eq 'internal' ) {
+            $curr_authtype = 'int';
+        } elsif ($enrollvar->{'authtype'} eq 'localauth' ) {
+            $curr_authtype = 'loc';
+        }
     }
     unless ($curr_authtype eq '') {
         $curr_authfield = $curr_authtype.'arg';
     }
-    my $javascript_validations=&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield);
+    my $javascript_validations = 
+        &Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
+                                                      $curr_authtype,$curr_authfield);
     my %param = ( formname => 'document.'.$env{'form.phase'},
-	   kerb_def_dom => $krbdefdom,
-	   kerb_def_auth => $krbdef,
+           kerb_def_dom => $krbdefdom,
+           kerb_def_auth => $krbdef,
            mode => 'modifycourse',
            curr_authtype => $curr_authtype,
-           curr_autharg => $enrollvar{'autharg'} 
-	);
+           curr_autharg => $enrollvar->{'autharg'}
+        );
     my (%authform,$authenitems);
     $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param);
     $authform{'int'} = &Apache::loncommon::authform_internal(%param);
@@ -479,261 +1015,246 @@ all settings except course code, course
         if ($authform{$item} ne '') {
             $authenitems .= $authform{$item}.'<br />';
         }
-    } 
-    if ($numlocalcc == 0) {
-        $ownertable = $lt{'nocc'};
     }
-
-    if ($numlocalcc > 0) {
-        @local_ccs = sort @local_ccs;
-        $ownertable = qq(
-            <input type="hidden" name="numlocalcc" value="$numlocalcc" />
-            <table>
-             <tr>
-               <td>$lt{'tabl'} - $cdom ($domdesc). $lt{'usrd'}
-              </td>
-             </tr>
-             <tr><td>&nbsp;</td></tr>
-             <tr>
-              <td>).
-            &Apache::loncommon::start_data_table()."\n".
-            &Apache::loncommon::start_data_table_header_row()."\n".
-                       "<th>$lt{'ownr'}</th>\n".
-                       "<th>$lt{'name'}</th>\n".
-                       "<th>$lt{'unme'}</th>\n".
-                       "<th>$lt{'stus'}</th>\n".
-            &Apache::loncommon::end_data_table_header_row()."\n";
-        foreach my $cc (@local_ccs) {
-            $ownertable .= &Apache::loncommon::start_data_table_row()."\n";
-            if ($cc eq $enrollvar{'courseowner'}) {
-                  $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" checked="checked" /></td>'."\n";
-            } else {
-                $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'" /></td>'."\n";
-            }
-            $ownertable .= 
-                 '<td>'.$pname{$cc}.'</td>'."\n".
-                 '<td>'.$cc.'</td>'."\n".
-                 '<td>'.$cc_status{$cc}.' '.$lt{'ccor'}.'</td>'."\n".
-                 &Apache::loncommon::end_data_table_row()."\n";
-        }
-        $ownertable .= &Apache::loncommon::end_data_table()."
-              </td>
-             </tr>
-            </table>";
-    }
-    &print_header($r,$cdesc,$javascript_validations);
-    my $type = $env{'form.type'};
-    if ($type eq '') {
-        $type = 'Course';
-    }
-    my $dctitle = &Apache::lonnet::plaintext('dc');
-    my $cctitle = &Apache::lonnet::plaintext('cc',$type);
-    my $mainheader = &mt('Course settings modifiable by [_1] only.',$dctitle);
-    my $hidden_elements = &hidden_form_elements();
-    $r->print(<<ENDDOCUMENT);
-<form action="/adm/modifycourse" method="post" name="$env{'form.phase'}">
-<h3>$mainheader</h3>
-</p><p>
-<table width="100%" cellspacing="6" cellpadding="6">
- <tr>
-  <td colspan="2">Use the appropriate text boxes and radio buttons below to change some or all of the four automated enrollment settings that may only be changed by a Domain Coordinator.
- </tr>
- <tr>
-  <td width="50%" valign="top">
-   <b>$lt{'ccod'}:</b>&nbsp;&nbsp;
-    <input type="text" size="10" name="coursecode" value="$enrollvar{'coursecode'}"/><br/><br/>
-    $lt{'ccus'}
-  </td>
-  <td width="50%" valign="top" rowspan="2">
-   <b>$lt{'cown'}:</b><br/><br/>
-   $ownertable
-   <br/><br/>
-   $lt{'cous'}
-  </td>
- </tr>
- <tr>
-  <td width="50%" valign="top">
-   <b>$lt{'deam'}:</b><br/><br/>
-   $authenitems
-   <br/>
-   $lt{'deus'}.
-   </td>
-   <td width="50%">&nbsp;</td>
- </tr>
-</table>
-<table width="90%" cellpadding="5" cellspacing="0">
- <tr>
-  <td align="left">
-   $hidden_elements
-   <input type="button" onClick="javascript:changePage(this.form,'processparms');javascript:verify_message(this.form)" value="$lt{'gobt'}" />
-  </td>
- </tr>
-</table>
-</form>
-<br/>
-<br/>
-ENDDOCUMENT
-    return;
+    return($javascript_validations,$authenitems);
 }
 
 sub modify_course {
     my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
-    my %longtype = &course_settings_descrip();
-    my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$cdom,$cnum);
-    my %currattr = ();
-    my %newattr = ();
-    my %cenv = ();
-    my $response;
-    my $chgresponse;
-    my $nochgresponse;
-    my $warning;
-    my $reply;
-    my @changes = ();
-    my @nochanges = ();
-    my @sections = ();
-    my @xlists = ();
-    my %changed = ( code       => 0,
-                    owner      => 0,
-                  );
-    unless ($settings{'internal.sectionnums'} eq '') {
-        if ($settings{'internal.sectionnums'} =~ m/,/) {
-            @sections = split/,/,$settings{'internal.sectionnums'};
-        } else {
-            $sections[0] = $settings{'internal.sectionnums'};
+    my %longtype = &course_settings_descrip($type);
+    my @items = ('internal.courseowner','description','internal.co-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'));
+        if (&showcredits($cdom)) {  
+            push(@items,'internal.defaultcredits');
         }
     }
-    unless ($settings{'internal.crosslistings'} eq'') {
-        if ($settings{'internal.crosslistings'} =~ m/,/) {
-            @xlists = split/,/,$settings{'internal.crosslistings'};
-        } else {
-            $xlists[0] = $settings{'internal.crosslistings'};
-        }
+    my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum);
+    my $description = $settings{'description'};
+    my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr,
+        %cenv,%changed,@changes,@nochanges,@sections,@xlists,@warnings);
+    my @modifiable_params = &get_dc_settable($type,$cdom);
+    foreach my $param (@modifiable_params) {
+        $currattr{$param} = $settings{'internal.'.$param};
     }
+    if ($type eq 'Community') {
+        %changed = ( owner  => 0 );
+        $ccrole = 'co';
+    } else {
+        %changed = ( code  => 0,
+                     owner => 0,
+                   );
+        $ccrole = 'cc';
+        unless ($settings{'internal.sectionnums'} eq '') {
+            if ($settings{'internal.sectionnums'} =~ m/,/) {
+                @sections = split/,/,$settings{'internal.sectionnums'};
+            } else {
+                $sections[0] = $settings{'internal.sectionnums'};
+            }
+        }
+        unless ($settings{'internal.crosslistings'} eq '') {
+            if ($settings{'internal.crosslistings'} =~ m/,/) {
+                @xlists = split/,/,$settings{'internal.crosslistings'};
+            } else {
+                $xlists[0] = $settings{'internal.crosslistings'};
+            }
+        }
+        if ($env{'form.login'} eq 'krb') {
+            $newattr{'authtype'} = $env{'form.login'};
+            $newattr{'authtype'} .= $env{'form.krbver'};
+            $newattr{'autharg'} = $env{'form.krbarg'};
+        } elsif ($env{'form.login'} eq 'int') {
+            $newattr{'authtype'} ='internal';
+            if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
+                $newattr{'autharg'} = $env{'form.intarg'};
+            }
+        } elsif ($env{'form.login'} eq 'loc') {
+            $newattr{'authtype'} = 'localauth';
+            if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+                $newattr{'autharg'} = $env{'form.locarg'};
+            }
+        }
+        if ( $newattr{'authtype'}=~ /^krb/) {
+            if ($newattr{'autharg'}  eq '') {
+                push(@warnings,
+                           &mt('As you did not include the default Kerberos domain'
+                          .' to be used for authentication in this class, the'
+                          .' institutional data used by the automated'
+                          .' enrollment process must include the Kerberos'
+                          .' domain for each new student.'));
+            }
+        }
 
-    my @modifiable_params = &get_dc_settable();
-    foreach my $param (@modifiable_params) {
-        my $attr = 'internal.'.$param;
-        $currattr{$param} = $settings{$attr};
+        if ( exists($env{'form.coursecode'}) ) {
+            $newattr{'coursecode'}=$env{'form.coursecode'};
+            unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
+                $changed{'code'} = 1;
+            }
+        }
+
+        if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
+            $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
+            $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
+        }
     }
 
-    my $description = $settings{'description'};
+    my @newmgrdc = ();
+    my @newmgrcc = ();
+    my @currmgrdc = split(/,/,$currattr{'selfenrollmgrdc'});
+    my @currmgrcc = split(/,/,$currattr{'selfenrollmgrcc'});
 
-    if ($env{'form.login'} eq 'krb') {
-        $newattr{'authtype'} = $env{'form.login'};
-        $newattr{'authtype'} .= $env{'form.krbver'};
-        $newattr{'autharg'} = $env{'form.krbarg'};
-    } elsif ($env{'form.login'} eq 'int') {
-        $newattr{'authtype'} ='internal';
-        if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
-            $newattr{'autharg'} = $env{'form.intarg'};
-        }
-    } elsif ($env{'form.login'} eq 'loc') {
-        $newattr{'authtype'} = 'localauth';
-        if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
-            $newattr{'autharg'} = $env{'form.locarg'};
-        }
-    }
-    if ( $newattr{'authtype'}=~ /^krb/) {
-        if ($newattr{'autharg'}  eq '') {
-            $warning = qq(<font color="red" size="+1">).
-	    &mt("As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student").qq(</font></p>);
+    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'} ) {
             $changed{'owner'} = 1;
         } 
     }
-													      
-    if ( exists($env{'form.coursecode'}) ) {
-        $newattr{'coursecode'}=$env{'form.coursecode'};
-        unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
-            $changed{'code'} = 1;
-        }
-    }
-    if ($changed{'owner'} || $changed{'code'}) { 
+
+    if ($changed{'owner'} || $changed{'code'}) {
         my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,
                                                     undef,undef,'.');
         if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') {
-            $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'};
-            $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
+            if ($changed{'code'}) {
+                $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'};
+            }
+            if ($changed{'owner'}) {
+                $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'};
+            }
             my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
             my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
+            if ($putres eq 'ok') {
+                &update_coowners($cdom,$cnum,$chome,\%settings,\%newattr);
+            }
         }
     }
     foreach my $param (@modifiable_params) {
         if ($currattr{$param} eq $newattr{$param}) {
             push(@nochanges,$param);
         } else {
-            my $attr = 'internal.'.$param;
-            $cenv{$attr} = $newattr{$param};
+            $cenv{'internal.'.$param} = $newattr{$param};
             push(@changes,$param);
         }
     }
     if (@changes > 0) {
-        $chgresponse = &mt("The following automated enrollment parameters have been changed:<br/><ul>");
+        $chgresponse = &mt('The following settings have been changed:').'<br/><ul>';
     }
-    if (@nochanges > 0) { 
-        $nochgresponse = &mt("The following automated enrollment parameters remain unchanged:<br/><ul>");
+    if (@nochanges > 0) {
+        $nochgresponse = &mt('The following settings remain unchanged:').'<br/><ul>';
     }
     if (@changes > 0) {
         my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
         if ($putreply !~ /^ok$/) {
-            $response = &mt("There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.<br/>").&mt('Error: ').$putreply;
+            $response = '<p class="LC_error">'.
+                        &mt('There was a problem processing your requested changes.').'<br />';
+            if ($type eq 'Community') {
+                $response .= &mt('Settings for this community have been left unchanged.');
+            } else {
+                $response .= &mt('Settings for this course have been left unchanged.');
+            }
+            $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/^$attr$/,@changes) {
-	            $chgresponse .= "<li>$longtype{$attr} ".&mt("now set to \"").$newattr{$attr}."\".</li>";
+                if (grep/^\Q$attr\E$/,@changes) {
+                    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 ($changed{'code'} || $changed{'owner'}) {
+            if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) {
                 if ( $newattr{'courseowner'} eq '') {
-	            $warning .= &mt("There is no owner associated with this LON-CAPA course.  If automated enrollment in LON-CAPA courses at your institution requires validation of course owners, automated enrollment will fail for this course.<br/>");
+	            push(@warnings,&mt('There is no owner associated with this LON-CAPA course.').
+                                   '<br />'.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.'));
                 } else {
+                    my %crsenv = &Apache::lonnet::get('environment',['internal.co-owners'],$cdom,$cnum);
+                    my $coowners = $crsenv{'internal.co-owners'};
 	            if (@sections > 0) {
                         if ($changed{'code'}) {
 	                    foreach my $sec (@sections) {
 		                if ($sec =~ m/^(.+):/) {
+                                    my $instsec = $1;
 		                    my $inst_course_id = $newattr{'coursecode'}.$1;
                                     my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id);
 			            if ($course_check eq 'ok') {
-                                        my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
-			                unless ($outcome eq 'ok') { 
-				            $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
+                                        my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
+			                unless ($outcome eq 'ok') {
+                               
+				            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
 			                }
 			            } else {
-			                $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $course_check.<br/>");
+                                        push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$course_check));
 			            }
 		                } else {
-			            $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
+			            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
 		                }
 		            }
 	                } elsif ($changed{'owner'}) {
                             foreach my $sec (@sections) {
                                 if ($sec =~ m/^(.+):/) {
-                                    my $inst_course_id = $newattr{'coursecode'}.$1;
-                                    my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
+                                    my $instsec = $1;
+                                    my $inst_course_id = $newattr{'coursecode'}.$instsec;
+                                    my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
                                     unless ($outcome eq 'ok') {
-                                        $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $1 for the following reason: $outcome.<br/>");
+                                        push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
                                     }
                                 } else {
-                                    $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for ").$newattr{'coursecode'}.&mt(" - section $sec because this is not a valid section entry.<br/>");
+                                    push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
                                 }
                             }
                         }
 	            } else {
-	                $warning .= &mt("As no section numbers are currently listed for LON-CAPA course: ").$description.&mt(", automated enrollment will not occur for any sections of coursecode: ").$newattr{'coursecode'}."<br/>";
+	                push(@warnings,&mt('As no section numbers are currently listed for "[_1]", automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
 	            }
 	            if ( (@xlists > 0) && ($changed{'owner'}) ) {
 	                foreach my $xlist (@xlists) {
 		            if ($xlist =~ m/^(.+):/) {
-                                my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$1,$newattr{'courseowner'});
+                                my $instxlist = $1;
+                                my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'},$coowners);
 		                unless ($outcome eq 'ok') {
-			            $warning .= &mt("If automatic enrollment is enabled for LON-CAPA course: ").$description.&mt(", automated enrollment may fail for crosslisted class: ").$1.&mt(" for the following reason: $outcome.<br/>");
+			            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome));
 		                }
 		            }
 	                }
@@ -743,7 +1264,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>';
         }
     }
 
@@ -753,99 +1282,468 @@ sub modify_course {
     if (@nochanges > 0) {
         $nochgresponse .=  "</ul><br/><br/>";
     }
-    unless ($warning eq '') {
-        $warning = &mt("The following warning messages were generated as a result of applying the changes you specified to course settings that can affect the automated enrollment process:<br/><br/>").$warning;
+    my ($warning,$numwarnings);
+    my $numwarnings = scalar(@warnings); 
+    if ($numwarnings) {
+        $warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'<p><ul>';
+        foreach my $warn (@warnings) {
+            $warning .= '<li><span class="LC_warning">'.$warn.'</span></li>';
+        }
+        $warning .= '</ul></p>';
     }
-    if ($response eq '') {
-        $reply = $chgresponse.$nochgresponse.$warning;
-    } else {
+    if ($response) {
         $reply = $response;
+    } else {
+        $reply = $chgresponse.$nochgresponse.$warning;
     }
-    &print_header($r,$cdesc);
-    $reply = '<h3>'.
-              &mt('Result of Changes to Automated Enrollment Settings.').
-             '</h3>'."\n".
-             '<table><tr><td>'.$reply.'</td></tr></table>'.
+    &print_header($r,$type);
+    my $mainheader = &modifiable_only_title($type);
+    $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('Back to options page').'</a>
-             </form>';
+             &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','&<>"');
+
+        push(@actions, '<a href="'.$escuri.'">'.
+                  &mt('Go to Automated Enrollment Manager for course').'</a>');
+    }
+    $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'));
+    my %designhash = &Apache::loncommon::get_domainconf($cdom);
+    my (%cchash,$autocoowners);
+    if ($designhash{$cdom.'.autoassign.co-owners'}) {
+        $autocoowners = 1;
+        %cchash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,['cc']);
+    }
+    if ($settings->{'internal.courseowner'} ne $newattr->{'courseowner'}) {
+        my $oldowner_to_coowner;
+        my @types = ('co-owners');
+        if (($newattr->{'coursecode'}) && ($autocoowners)) {
+            my $oldowner = $settings->{'internal.courseowner'};
+            if ($cchash{$oldowner.':cc'}) {
+                my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$oldowner);
+                if ($result eq 'valid') {
+                    if ($settings->{'internal.co-owner'}) {
+                        my @current = split(',',$settings->{'internal.co-owners'});
+                        unless (grep(/^\Q$oldowner\E$/,@current)) {
+                            $oldowner_to_coowner = 1;
+                        }
+                    } else {
+                        $oldowner_to_coowner = 1;
+                    }
+                }
+            }
+        } else {
+            push(@types,'pendingco-owners');
+        }
+        foreach my $type (@types) {
+            if ($settings->{'internal.'.$type}) {
+                my @current = split(',',$settings->{'internal.'.$type});
+                my $newowner = $newattr->{'courseowner'};
+                my @newvalues = ();
+                if (($newowner ne '') && (grep(/^\Q$newowner\E$/,@current))) {
+                    foreach my $person (@current) {
+                        unless ($person eq $newowner) {
+                            push(@newvalues,$person);
+                        }
+                    }
+                } else {
+                    @newvalues = @current;
+                }
+                if ($oldowner_to_coowner) {
+                    push(@newvalues,$settings->{'internal.courseowner'});
+                    @newvalues = sort(@newvalues);
+                }
+                my $newownstr = join(',',@newvalues);
+                if ($newownstr ne $settings->{'internal.'.$type}) {
+                    if ($type eq 'co-owners') {
+                        my $deleted = '';
+                        unless (@newvalues) {
+                            $deleted = 1;
+                        }
+                        &Apache::lonnet::store_coowners($cdom,$cnum,$chome,
+                                                        $deleted,@newvalues);
+                    } else {
+                        my $pendingcoowners;
+                        my $cid = $cdom.'_'.$cnum;
+                        if (@newvalues) {
+                            $pendingcoowners = join(',',@newvalues);
+                            my %pendinghash = (
+                                'internal.pendingco-owners' => $pendingcoowners,
+                            );
+                            my $putresult = &Apache::lonnet::put('environment',\%pendinghash,$cdom,$cnum);
+                            if ($putresult eq 'ok') {
+                                if ($env{'course.'.$cid.'.num'} eq $cnum) {
+                                    &Apache::lonnet::appenv({'course.'.$cid.'.internal.pendingco-owners' => $pendingcoowners});
+                                }
+                            }
+                        } else {
+                            my $delresult = &Apache::lonnet::del('environment',['internal.pendingco-owners'],$cdom,$cnum);
+                            if ($delresult eq 'ok') {
+                                if ($env{'course.'.$cid.'.internal.pendingco-owners'}) {
+                                    &Apache::lonnet::delenv('course.'.$cid.'.internal.pendingco-owners');
+                                }
+                            }
+                        }
+                    }
+                } elsif ($oldowner_to_coowner) {
+                    &Apache::lonnet::store_coowners($cdom,$cnum,$chome,'',
+                                         $settings->{'internal.courseowner'});
+
+                }
+            } elsif ($oldowner_to_coowner) {
+                &Apache::lonnet::store_coowners($cdom,$cnum,$chome,'',
+                                     $settings->{'internal.courseowner'});
+            }
+        }
+    }
+    if ($settings->{'internal.coursecode'} ne $newattr->{'coursecode'}) {
+        if ($newattr->{'coursecode'} ne '') {
+            my %designhash = &Apache::loncommon::get_domainconf($cdom);
+            if ($designhash{$cdom.'.autoassign.co-owners'}) {
+                my @newcoowners = ();
+                if ($settings->{'internal.co-owners'}) {
+                    my @currcoown = split(',',$settings->{'internal.co-owners'});
+                    my ($updatecoowners,$delcoowners);
+                    foreach my $person (@currcoown) {
+                        my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);
+                        if ($result eq 'valid') {
+                            push(@newcoowners,$person);
+                        }
+                    }
+                    foreach my $item (sort(keys(%cchash))) {
+                        my ($uname,$udom,$urole) = split(':',$item);
+                        next if ($uname.':'.$udom eq $newattr->{'courseowner'});
+                        unless (grep(/^\Q$uname\E:\Q$udom\E$/,@newcoowners)) {
+                            my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$uname.':'.$udom);
+                            if ($result eq 'valid') {
+                                push(@newcoowners,$uname.':'.$udom);
+                            }
+                        }
+                    }
+                    if (@newcoowners) {
+                        my $coowners = join(',',sort(@newcoowners));
+                        unless ($coowners eq $settings->{'internal.co-owners'}) {
+                            $updatecoowners = 1;
+                        }
+                    } else {
+                        $delcoowners = 1;
+                    }
+                    if ($updatecoowners || $delcoowners) {
+                        &Apache::lonnet::store_coowners($cdom,$cnum,$chome,
+                                                        $delcoowners,@newcoowners);
+                    }
+                } else {
+                    foreach my $item (sort(keys(%cchash))) {
+                        my ($uname,$udom,$urole) = split(':',$item);
+                        push(@newcoowners,$uname.':'.$udom);
+                    }
+                    if (@newcoowners) {
+                        &Apache::lonnet::store_coowners($cdom,$cnum,$chome,'',
+                                                        @newcoowners);
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 sub modify_quota {
-    my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_;
-    &print_header($r,$cdesc);
+    my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+    &print_header($r,$type);
+    my $lctype = lc($type);
+    my $headline = &mt("Disk space quotas for $lctype: [_1]",
+                     '<span class="LC_nobreak">'.$cdesc.'</span>');
+    $r->print('<form action="/adm/modifycourse" method="post" name="processquota">'."\n".
+              '<h3>'.$headline.'</h3>');
+    my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota'],$cdom,$cnum);
+    my %staticdefaults = (
+                           coursequota   => 20,
+                           uploadquota   => 500,
+                         );
+    my %default;
+    $default{'coursequota'} = $staticdefaults{'coursequota'};
+    my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+    $default{'uploadquota'} = $domdefs{'uploadquota'};
+    if ($default{'uploadquota'} eq '') {
+        $default{'uploadquota'} = $staticdefaults{'uploadquota'};
+    }
+    my (%cenv,%showresult);
+    foreach my $item ('coursequota','uploadquota') {
+        if ($env{'form.'.$item} ne '') {
+            my $newquota = $env{'form.'.$item};
+            if ($newquota =~ /^\s*(\d+\.?\d*|\.\d+)\s*$/) {
+                $newquota = $1;
+                if ($oldsettings{'internal.'.$item} == $newquota) {
+                    if ($item eq 'coursequota') {
+                        $r->print(&mt('The disk space allocated for group portfolio files remains unchanged as [_1] MB.',$newquota).'<br />');
+                    } else {
+                        $r->print(&mt('The disk space allocated for files uploaded via the Content Editor remains unchanged as [_1] MB.',$newquota).'<br />');
+                    }
+                } else {
+                    $cenv{'internal.'.$item} = $newquota;
+                    $showresult{$item} = 1;
+                }
+            } else {
+                if ($item eq 'coursequota') { 
+                    $r->print(&mt('The proposed group portfolio quota contained invalid characters, so the quota is unchanged.').'<br />');
+                } else {
+                    $r->print(&mt('The proposed quota for content uploaded via the Content Editor contained invalid characters, so the quota is unchanged.').'<br />');
 
-    my %lt = &Apache::lonlocal::texthash(
-                                         'back' => 'Back to options page',
-                                        );
-    $r->print('
-<form action="/adm/modifycourse" method="post" name="processquota">
-<h3>'.&mt('Disk space for storage of group portfolio files for [_1]',$cdesc).
-             '</h3>');
-    my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
-    my $defaultquota = 20;
-    if ($env{'form.coursequota'} ne '') {
-        my $newquota = $env{'form.coursequota'};
-        if ($newquota =~ /^\s*(\d+\.?\d*|\.\d+)\s*$/) {
-            $newquota = $1;
-            if ($oldsettings{'internal.coursequota'} eq $env{'form.coursequota'}) {
-                $r->print(&mt('The disk space allocated for group portfolio files remains unchanged as ').$env{'form.coursequota'}.' Mb');
+                }
+            }
+        }
+    }
+    if (keys(%cenv)) {
+        my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
+                                            $cnum);
+        foreach my $key (sort(keys(%showresult))) {
+            if (($oldsettings{'internal.'.$key} eq '') && 
+                ($env{'form.'.$key} == $default{$key})) {
+                if ($key eq 'uploadquota') {
+                    if ($type eq 'Community') {
+                        $r->print(&mt('The disk space allocated for files uploaded to this community via the Content Editor is the default quota for this domain: [_1] MB.',
+                                      $default{$key}).'<br />');
+                    } else {
+                        $r->print(&mt('The disk space allocated for files uploaded to this course via the Content Editor is the default quota for this domain: [_1] MB.',
+                                      $default{$key}).'<br />');
+                    }
+                } else { 
+                    if ($type eq 'Community') {
+                        $r->print(&mt('The disk space allocated for group portfolio files in this community is the default quota for this domain: [_1] MB.',
+                                      $default{$key}).'<br />');
+                    } else {
+                        $r->print(&mt('The disk space allocated for group portfolio files in this course is the default quota for this domain: [_1] MB.',
+                                      $default{$key}).'<br />');
+                    }
+                }
+                delete($showresult{$key});
+            }
+        }
+        if ($putreply eq 'ok') {
+            my %updatedsettings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota'],$cdom,$cnum);
+            if ($showresult{'coursequota'}) {
+                $r->print(&mt('The disk space allocated for group portfolio files is now: [_1] MB.',
+                              '<b>'.$updatedsettings{'internal.coursequota'}.'</b>').'<br />');
+                my $usage = &Apache::longroup::sum_quotas($cdom.'_'.$cnum);
+                if ($usage >= $updatedsettings{'internal.coursequota'}) {
+                    my $newoverquota;
+                    if ($usage < $oldsettings{'internal.coursequota'}) {
+                        $newoverquota = 'now';
+                    }
+                    $r->print('<p>');
+                    if ($type eq 'Community') {
+                        $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 $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>');
+                }
+            }
+            if ($showresult{'uploadquota'}) {
+                $r->print(&mt('The disk space allocated for content uploaded directly via the Content Editor is now: [_1] MB.',
+                              '<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: ').
+                      $putreply);
+        }
+    }
+    $r->print('<p>'.
+              '<a href="javascript:changePage(document.processquota,'."'menu'".')">'.
+              &mt('Pick another action').'</a>');
+    $r->print(&hidden_form_elements().'</form>');
+    return;
+}
+
+sub modify_anonsurvey_threshold {
+    my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+    &print_header($r,$type);
+    $r->print('<form action="/adm/modifycourse" method="post" name="processthreshold">'."\n".
+              '<h3>'.&mt('Responder threshold required for display of anonymous survey submissions:').
+              ' <span class="LC_nobreak">'.$cdesc.'</span></h3><br />');
+    my %oldsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+    my $defaultthreshold; 
+    if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+        $defaultthreshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+        if ($defaultthreshold eq '') {
+            $defaultthreshold = 10;
+        }
+    } else {
+        $defaultthreshold = 10;
+    }
+    if ($env{'form.threshold'} eq '') {
+        $r->print(&mt('The proposed responder threshold for display of anonymous survey submissions was blank, so the threshold is unchanged.'));
+    } else {
+        my $newthreshold = $env{'form.threshold'};
+        if ($newthreshold =~ /^\s*(\d+)\s*$/) {
+            $newthreshold = $1;
+            if ($oldsettings{'internal.anonsurvey_threshold'} eq $env{'form.threshold'}) {
+                $r->print(&mt('Responder threshold for anonymous survey submissions display remains unchanged: [_1].',$env{'form.threshold'}));
             } else {
                 my %cenv = (
-                           'internal.coursequota' => $env{'form.coursequota'},
+                           'internal.anonsurvey_threshold' => $env{'form.threshold'},
                            );
                 my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
                                                     $cnum);
-                if (($oldsettings{'internal.coursequota'} eq '') && 
-                    ($env{'form.coursequota'} == $defaultquota)) {
-                    $r->print(&mt('The disk space allocated for group portfolio files in this course is the default quota for this domain:').' '.$defaultquota.' Mb');
+                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));
                 } else {
                     if ($putreply eq 'ok') {
-                        my %updatedsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum);
-                        $r->print(&mt('The disk space allocated for group portfolio files is now:').' '.$updatedsettings{'internal.coursequota'}.' Mb.');
-                        my $usage = &Apache::longroup::sum_quotas($cdom.'_'.$cnum);
-                        if ($usage >= $updatedsettings{'internal.coursequota'}) {
-                            my $newoverquota;
-                            if ($usage < $oldsettings{'internal.coursequota'}) {
-                                $newoverquota = 'now';
-                            }
-                            $r->print('<br /><br />'.
-      &mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.
-      &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.'));
-                        }
+                        my %updatedsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
+                        $r->print(&mt('The responder threshold for display of anonymous survey submissions is now: [_1].','<b>'.$updatedsettings{'internal.anonsurvey_threshold'}.'</b>'));
                     } else {
-                        $r->print(&mt('There was an error'));
+                        $r->print(&mt('An error occurred storing the responder threshold for anonymous submissions display: ').
+                                  $putreply);
                     }
                 }
             }
         } else {
-            $r->print(&mt('The new quota requested contained invalid characters, so the quota is unchanged.'));
+            $r->print(&mt('The proposed responder threshold for display of anonymous submissions contained invalid characters, so the threshold is unchanged.'));
         }
     }
-    $r->print(qq|<br /><br />
-<a href="javascript:changePage(document.processquota,'menu')">$lt{'back'}</a>|);
+    $r->print('<p>'.
+              '<a href="javascript:changePage(document.processthreshold,'."'menu'".')">'.
+              &mt('Pick another action').'</a></p>');
     $r->print(&hidden_form_elements().'</form>');
     return;
 }
 
-sub modify_catsettings {
-    my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_;
-    &print_header($r,$cdesc);
+sub modify_postsubmit_config {
+    my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+    &print_header($r,$type);
     my %lt = &Apache::lonlocal::texthash(
-                                         'back' => 'Back to options page',
-                                        );
-    my %desc = &Apache::lonlocal::texthash(
-                                           'hidefromcat' => 'Excluded from course catalog',
-                                           'categories' => 'Assigned categories for this course',
-                                          );
+                subb => 'Submit button behavior after student makes a submission:',
+                unch => 'Post submission behavior of the Submit button is unchanged.',
+                erro => 'An error occurred when saving your proposed changes.',
+                inva => 'An invalid response was recorded.',
+                pick => 'Pick another action',
+             );
+    $r->print('<form action="/adm/modifycourse" method="post" name="processpostsubmit">'."\n".
+              '<h3>'.$lt{'subb'}.' <span class="LC_nobreak">('.$cdesc.')</span></h3><br />');
+    my %oldsettings = 
+        &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout','internal.coursecode','internal.textbook'],$cdom,$cnum);
+    my $postsubmit = $env{'form.postsubmit'};
+    if ($postsubmit eq '1') {
+        my $postsubtimeout = $env{'form.postsubtimeout'};
+        $postsubtimeout =~ s/[^\d\.]+//g;
+        if (($oldsettings{'internal.postsubmit'} eq $postsubmit) && ($oldsettings{'internal.postsubtimeout'} eq $postsubtimeout)) {
+            $r->print($lt{'unch'}); 
+        } else {
+            my %cenv = (
+                         'internal.postsubmit' => $postsubmit,
+                       );
+            if ($postsubtimeout eq '') {
+                my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
+                if ($putreply eq 'ok') {
+                    my $defaulttimeout = &domain_postsubtimeout($cdom,$type,\%oldsettings);
+                    $r->print(&mt('The proposed duration for disabling the Submit button post-submission was blank, so the domain default of [quant,_1,second] will be used.',$defaulttimeout));
+                    if (exists($oldsettings{'internal.postsubtimeout'})) {
+                        &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
+                    }
+                } else {
+                    $r->print($lt{'erro'});
+                }
+            } else { 
+                $cenv{'internal.postsubtimeout'} = $postsubtimeout;
+                my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
+                if ($putreply eq 'ok') {
+                    if ($postsubtimeout eq '0') {
+                        $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.')); 
+                    } else {
+                        $r->print(&mt('Submit button will be disabled after student submission for [quant,_1,second].',$postsubtimeout));
+                    }
+                } else {
+                    $r->print($lt{'erro'});
+                }
+            }
+        }
+    } elsif ($postsubmit eq '0') {
+        if ($oldsettings{'internal.postsubmit'} eq $postsubmit) {
+            $r->print($lt{'unch'});
+        } else {
+            if (exists($oldsettings{'internal.postsubtimeout'})) {
+                &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);  
+            }
+            my %cenv = (
+                         'internal.postsubmit' => $postsubmit,
+                       );
+            my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
+            if ($putreply eq 'ok') {
+                $r->print(&mt('Submit button will not be disabled after student submission'));
+            } else {
+                $r->print($lt{'erro'});
+            }
+        }
+    } else {
+        $r->print($lt{'inva'}.' '.$lt{'unch'});
+    }
+    $r->print('<p>'.
+              '<a href="javascript:changePage(document.processpostsubmit,'."'menu'".')">'.
+              &mt('Pick another action').'</a></p>');
+    $r->print(&hidden_form_elements().'</form>');
+    return;
+}
+
+sub modify_catsettings {
+    my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
+    &print_header($r,$type);
+    my ($ccrole,%desc);
+    if ($type eq 'Community') {
+        $desc{'hidefromcat'} = &mt('Excluded from community catalog');
+        $desc{'categories'} = &mt('Assigned categories for this community');
+        $ccrole = 'co';
+    } else {
+        $desc{'hidefromcat'} = &mt('Excluded from course catalog');
+        $desc{'categories'} = &mt('Assigned categories for this course');
+        $ccrole = 'cc';
+    }
     $r->print('
 <form action="/adm/modifycourse" method="post" name="processcat">
 <h3>'.&mt('Category settings').'</h3>');
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
-    my @cat_params = &catalog_settable($domconf{'coursecategories'});
+    my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
     if (@cat_params > 0) {
         my (%cenv,@changes,@nochanges);
         my %currsettings =
@@ -914,6 +1812,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') {
@@ -926,39 +1831,46 @@ sub modify_catsettings {
                         my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
                         my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
                     }
-                    $r->print(&mt('The following changes occurred').'<ul>');
+                    $r->print(&mt('The following changes occurred:').'<ul>');
                     foreach my $item (@changes) {
-                        $r->print('<li>'.&mt('[_1] now set to [_2]',$desc{$item},$showitem{$item}).'</li>');
+                        $r->print('<li>'.&mt('[_1] now set to: [_2]',$desc{$item},$showitem{$item}).'</li>');
                     }
                     $r->print('</ul><br />');
                 }
             }
             if (@nochanges > 0) {
-                $r->print(&mt('The following were unchanged').'<ul>');
+                $r->print(&mt('The following were unchanged:').'<ul>');
                 foreach my $item (@nochanges) {
-                    $r->print('<li>'.&mt('[_1] still set to [_2]',$desc{$item},$showitem{$item}).'</li>');
+                    $r->print('<li>'.&mt('[_1] still set to: [_2]',$desc{$item},$showitem{$item}).'</li>');
                 }
                 $r->print('</ul>');
             }
         }
     } else {
-        $r->print(&mt('Category settings for courses in this domain should be modified in course context (via "Set Course Environment").').'<br />');
+        my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+        my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+                                             '=1&destinationurl=/adm/courseprefs','&<>"');
+        if ($type eq 'Community') {
+            $r->print(&mt('Category settings for communities in this domain should be modified in community context (via "[_1]Community Configuration[_2]").','<a href="$escuri">','</a>').'<br />');
+        } else {
+            $r->print(&mt('Category settings for courses in this domain should be modified in course context (via "[_1]Course Configuration[_2]").','<a href="$escuri">','</a>').'<br />');
+        }
     }
     $r->print('<br />'."\n".
               '<a href="javascript:changePage(document.processcat,'."'menu'".')">'.
-              $lt{'back'}.'</a>');
+              &mt('Pick another action').'</a>');
     $r->print(&hidden_form_elements().'</form>');
     return;
 }
 
 sub print_header {
-    my ($r,$cdesc,$javascript_validations) = @_;
+    my ($r,$type,$javascript_validations) = @_;
     my $phase = "start";
     if ( exists($env{'form.phase'}) ) {
         $phase = $env{'form.phase'};
     }
     my $js = qq|
-<script type="text/javascript">
+
 function changePage(formname,newphase) {
     formname.phase.value = newphase;
     if (newphase == 'processparms') {
@@ -966,51 +1878,172 @@ function changePage(formname,newphase) {
     }
     formname.submit();
 }
-</script>
+
 |;
     if ($phase eq 'setparms') {
-	$js .= qq|
-<script  type="text/javascript">
-$javascript_validations
-</script>
-|;
+	$js .= $javascript_validations;
     } elsif ($phase eq 'courselist') {
         $js .= qq|
-<script type="text/javascript">
+
 function gochoose(cname,cdom,cdesc) {
     document.courselist.pickedcourse.value = cdom+'_'+cname;
     document.courselist.submit();
 }
-</script>
+
+function hide_searching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
 |;
     } elsif ($phase eq 'setquota') {
-        $js .= <<'ENDSCRIPT';
-<script type="text/javascript">
-function verify_quota(formname) {
-    var newquota = formname.coursequota.value; 
-    var num_reg = /^\s*(\d+\.?\d*|\.\d+)\s*$/;
+        my $invalid = &mt('The quota you entered contained invalid characters.');
+        my $alert = &mt('You must enter a number');
+        &js_escape(\$invalid);
+        &js_escape(\$alert);
+        my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';
+        $js .= <<"ENDSCRIPT";
+
+function verify_quota() {
+    var newquota = document.setquota.coursequota.value; 
+    var num_reg = $regexp;
     if (num_reg.test(newquota)) {
-        changePage(formname,'processquota');
+        changePage(document.setquota,'processquota');
+    } else {
+        alert("$invalid\\n$alert");
+        return false;
+    }
+    return true;
+}
+
+ENDSCRIPT
+    } elsif ($phase eq 'setanon') {
+        my $invalid = &mt('The responder threshold you entered is invalid.');
+        my $alert = &mt('You must enter a positive integer.');
+        &js_escape(\$invalid);
+        &js_escape(\$alert);
+        my $regexp = ' /^\s*\d+\s*$/';
+        $js .= <<"ENDSCRIPT";
+
+function verify_anon_threshold() {
+    var newthreshold = document.setanon.threshold.value;
+    var num_reg = $regexp;
+    if (num_reg.test(newthreshold)) {
+        if (newthreshold > 0) {
+            changePage(document.setanon,'processthreshold');
+        } else {
+            alert("$invalid\\n$alert");
+            return false;
+        }
     } else {
-        alert("The quota you entered contained invalid characters.\nYou must enter a number");
+        alert("$invalid\\n$alert");
+        return false;
+    }
+    return true;
+}
+
+ENDSCRIPT
+    } elsif ($phase eq 'setpostsubmit') {
+        my $invalid = &mt('The choice entered for disabling the submit button is invalid.');
+        my $invalidtimeout = &mt('The timeout you entered for disabling the submit button is invalid.');
+        my $alert = &mt('Enter one of: a positive integer, 0 (for no timeout), or leave blank to use domain default');
+        &js_escape(\$invalid);
+        &js_escape(\$invalidtimeout);
+        &js_escape(\$alert);
+        my $regexp = ' /^\s*\d+\s*$/';
+
+        $js .= <<"ENDSCRIPT"; 
+
+function verify_postsubmit() {
+    var optionsElement = document.setpostsubmit.postsubmit;
+    var verified = '';
+    if (optionsElement.length) {
+        var currval;
+        for (var i=0; i<optionsElement.length; i++) {
+            if (optionsElement[i].checked) {
+               currval = optionsElement[i].value;
+            }
+        }
+        if (currval == 1) {
+            var newtimeout = document.setpostsubmit.postsubtimeout.value;
+            if (newtimeout == '') {
+                verified = 'ok';
+            } else {
+                var num_reg = $regexp;
+                if (num_reg.test(newtimeout)) {
+                    if (newtimeout>= 0) {
+                        verified = 'ok';
+                    } else {
+                        alert("$invalidtimeout\\n$alert");
+                        return false;
+                    }
+                } else {
+                    alert("$invalid\\n$alert");
+                    return false;
+                }
+            }
+        } else {
+            if (currval == 0) {
+               verified = 'ok'; 
+            } else {
+               alert('$invalid');
+               return false;
+            }
+        }
+        if (verified == 'ok') {
+            changePage(document.setpostsubmit,'processpostsubmit');
+            return true;
+        }
+    }
+    return false;
+}
+
+function togglePostsubmit(caller) {
+    var optionsElement = document.setpostsubmit.postsubmit;
+    if (document.getElementById(caller)) {
+        var divitem = document.getElementById(caller);
+        var optionsElement = document.setpostsubmit.postsubmit; 
+        if (optionsElement.length) {
+            var currval;
+            for (var i=0; i<optionsElement.length; i++) {
+                if (optionsElement[i].checked) {
+                   currval = optionsElement[i].value;
+                }
+            }
+            if (currval == 1) {
+                divitem.style.display = 'block';
+            } else {
+                divitem.style.display = 'none';
+            }
+        }
     }
     return;
 }
-</script>
+
 ENDSCRIPT
+
     }
     my $starthash;
     if ($env{'form.phase'} eq 'ccrole') {
         $starthash = {
            add_entries => {'onload' => "javascript:document.ccrole.submit();"},
                      };
+    } elsif ($phase eq 'courselist') {
+        $starthash = {
+           add_entries => {'onload' => "hide_searching(); courseSet(document.filterpicker.official, 'load');"},
+                     };
+    }
+    $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
+					     &Apache::lonhtmlcommon::scripttag($js),
+                                             $starthash));
+    my $bread_text = "View/Modify Courses/Communities";
+    if ($type eq 'Community') {
+        $bread_text = 'Community Settings';
+    } else {
+        $bread_text = 'Course Settings';
     }
-    $r->print(&Apache::loncommon::start_page('View/Modify Course Settings',
-					     $js,$starthash));
-    my $bread_text = "View/Modify Courses";
-    if ($cdesc ne '') {
-        $bread_text = "Course Settings: $cdesc"; 
-    } 
     $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
     return;
 }
@@ -1022,42 +2055,49 @@ 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});
+    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';
             }
-            $description = &unescape($description);
-            $instcode = &unescape($instcode);
-            if ($instcode) {
-                $description .= " ($instcode)";
-            }
-            return ($ok_course,$description);
         }
     }
+    return ($ok_course,$description,\%coursehash);
 }
 
 sub course_settings_descrip {
-    my %longtype = &Apache::lonlocal::texthash(
+    my ($type) = @_;
+    my %longtype;
+    if ($type eq 'Community') {
+         %longtype = &Apache::lonlocal::texthash(
+                      '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(
                       'authtype' => 'Default authentication method',
                       'autharg'  => 'Default authentication parameter',
                       'autoadds' => 'Automated adds',
@@ -1068,22 +2108,39 @@ sub course_settings_descrip {
                       'default_enrollment_end_date' => 'Date of last student access',
                       'coursecode' => 'Official course code',
                       'courseowner' => "Username:domain of course owner",
+                      'co-owners'   => "Username:domain of each co-owner",
                       'notifylist' => 'Course Coordinators to be notified of enrollment changes',
-                      'sectionnums' => 'Course section number(:LON-CAPA section)',
-                      'crosslistings' => 'Crosslisted class(:LON-CAPA section)',
-                   );
+                      'sectionnums' => 'Course section number:LON-CAPA section',
+                      'crosslistings' => 'Crosslisted class:LON-CAPA section',
+                      'defaultcredits' => 'Credits',
+                      'selfenrollmgrdc'  => "Course-specific self-enrollment configuration by Domain Coordinator",
+                      'selfenrollmgrcc'  => "Course-specific self-enrollment configuration by Course personnel",
+
+         );
+    }
     return %longtype;
 }
 
 sub hidden_form_elements {
     my $hidden_elements = 
-      &Apache::lonhtmlcommon::echo_form_input(['gosearch','coursecode',
+      &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
           'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
-          'locarg','krbarg','krbver','counter','hidefromcat','usecategory'])."\n".
+          'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
+          'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
+          'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
+          'sections','newsec'],['^selfenrollmgr_'])."\n".
           '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
     return $hidden_elements;
 }
 
+sub showcredits {
+    my ($dom) = @_;
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) {
+        return 1;
+    }
+}
+
 sub handler {
     my $r = shift;
     if ($r->header_only) {
@@ -1091,8 +2148,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;
@@ -1100,40 +2159,56 @@ sub handler {
         &Apache::lonhtmlcommon::clear_breadcrumbs();
 
         my $phase = $env{'form.phase'};
+        if ($env{'form.updater'}) {
+            $phase = '';
+        }
         if ($phase eq '') {
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/modifycourse",
-              text=>"Course search"});
+              text=>"Course/Community search"});
             &print_course_search_page($r,$dom,$domdesc);
         } else {
             my $firstform = $phase;
             if ($phase eq 'courselist') {
                 $firstform = 'filterpicker';
+            }
+            my $choose_text;
+            my $type = $env{'form.type'};
+            if ($type eq '') {
+                $type = 'Course';
+            }
+            if ($type eq 'Community') {
+                $choose_text = "Choose a community";
+            } else {
+                $choose_text = "Choose a course";
             } 
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"javascript:changePage(document.$firstform,'')",
-              text=>"Course search"},
+              text=>"Course/Community search"},
               {href=>"javascript:changePage(document.$phase,'courselist')",
-              text=>"Choose a course"});
+              text=>$choose_text});
             if ($phase eq 'courselist') {
                 &print_course_selection_page($r,$dom,$domdesc);
             } else {
-                my ($checked,$cdesc) = &check_course($r,$dom,$domdesc);
-                my $type = $env{'form.type'};
-                if ($type eq '') {
-                    $type = 'Course';
-                }
+                my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
                 if ($checked eq 'ok') {
+                    my $enter_text;
+                    if ($type eq 'Community') {
+                        $enter_text = 'Enter community';
+                    } else {
+                        $enter_text = 'Enter course';
+                    }
                     if ($phase eq 'menu') {
                         &Apache::lonhtmlcommon::add_breadcrumb
                         ({href=>"javascript:changePage(document.$phase,'menu')",
                           text=>"Pick action"});
-                        &print_modification_menu($r,$cdesc,$domdesc,$dom);
+                        &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')",
-                           text=>"Enter course"});
-                        &print_ccrole_selected($r,$cdesc,$domdesc);
+                           text=>$enter_text});
+                        &print_ccrole_selected($r,$type);
                     } else {
                         &Apache::lonhtmlcommon::add_breadcrumb
                         ({href=>"javascript:changePage(document.$phase,'menu')",
@@ -1151,8 +2226,31 @@ sub handler {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
-                            &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc);
-                        } elsif ($phase eq 'viewparms') {  
+                            &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+                        } elsif ($phase eq 'setanon') {
+                            &Apache::lonhtmlcommon::add_breadcrumb
+                            ({href=>"javascript:changePage(document.$phase,'$phase')",
+                              text=>"Threshold for anonymous submissions display"});
+                            &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type);
+                        } elsif ($phase eq 'processthreshold') {
+                            &Apache::lonhtmlcommon::add_breadcrumb
+                            ({href=>"javascript:changePage(document.$phase,'setanon')",
+                              text=>"Threshold for anonymous submissions display"});
+                            &Apache::lonhtmlcommon::add_breadcrumb
+                            ({href=>"javascript:changePage(document.$phase,'$phase')",
+                              text=>"Result"});
+                            &modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+                        } elsif ($phase eq 'setpostsubmit') {
+                            &Apache::lonhtmlcommon::add_breadcrumb
+                            ({href=>"javascript:changePage(document.$phase,'$phase')",
+                              text=>"Configure submit button behavior post-submission"});
+                            &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type);
+                        } elsif ($phase eq 'processpostsubmit') {
+                            &Apache::lonhtmlcommon::add_breadcrumb
+                            ({href=>"javascript:changePage(document.$phase,'$phase')",
+                              text=>"Result"});
+                            &modify_postsubmit_config($r,$cdom,$cnum,$cdesc,$domdesc,$type);
+                        } elsif ($phase eq 'viewparms') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'viewparms')",
                               text=>"Display settings"});
@@ -1161,7 +2259,7 @@ sub handler {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Change settings"});
-                            &print_course_modification_page($r,$cdom,$cnum,$cdesc,$domdesc);
+                            &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type);
                         } elsif ($phase eq 'processparms') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'setparms')",
@@ -1182,18 +2280,36 @@ sub handler {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
-                            &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc);
+                            &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">'.&mt('The course you selected is not a valid course in this domain')." ($domdesc)".'</span>'); 
+                    $r->print('<span class="LC_error">');
+                    if ($type eq 'Community') {
+                        $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>");
                 }
             }
         }
         &print_footer($r);
     } else {
         $env{'user.error.msg'}=
-        "/adm/modifycourse:ccc:0:0:Cannot modify course settings";
+        "/adm/modifycourse:ccc:0:0:Cannot modify course/community settings";
         return HTTP_NOT_ACCEPTABLE;
     }
     return OK;