--- loncom/interface/lonmodifycourse.pm	2016/10/23 02:24:51	1.79.2.3
+++ loncom/interface/lonmodifycourse.pm	2016/04/02 04:30:21	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.79.2.3 2016/10/23 02:24:51 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.80 2016/04/02 04:30:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,8 +44,7 @@ sub get_dc_settable {
     if ($type eq 'Community') {
         return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
     } else {
-        my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc',
-                     'selfenrollmgrcc','mysqltables');
+        my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
         if (&showcredits($cdom)) {
             push(@items,'defaultcredits');
         }
@@ -56,7 +55,7 @@ sub get_dc_settable {
 sub autoenroll_keys {
     my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
                      'autoadds','autodrops','autostart','autoend','sectionnums',
-                     'crosslistings','co-owners','autodropfailsafe'];
+                     'crosslistings','co-owners'];
     my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
     return ($internals,$accessdates);
 }
@@ -118,13 +117,14 @@ sub get_enrollment_settings {
                 $enrollvar{$type} =~ s/,/, /g;
             } elsif ($type eq "authtype"
                      || $type eq "autharg"    || $type eq "coursecode"
-                     || $type eq "crosslistings" || $type eq "selfenrollmgr"
-                     || $type eq "autodropfailsafe") {
+                     || $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};
@@ -173,53 +173,17 @@ sub print_course_search_page {
     $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
                                                 \$numtitles,'modifycourse',undef,undef,undef,
                                                 \@codetitles,$dom));
-
-    my ($actiontext,$roleoption,$settingsoption);
     if ($type eq 'Community') {
-        $actiontext = &mt('Actions available after searching for a community:');
-    } else {
-        $actiontext = &mt('Actions available after searching for a course:');
-    }
-    if (&Apache::lonnet::allowed('ccc',$dom)) {
-       if ($type eq 'Community') {
-           $roleoption = &mt('Enter the community with the role of [_1]',$cctitle);
-           $settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle);
-       } else {
-           $roleoption = &mt('Enter the course with the role of [_1]',$cctitle);
-           $settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle);
-       }
-    } elsif (&Apache::lonnet::allowed('rar',$dom)) {
-        my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
-                                                         'adhocroles.'.$dom);
-        if (keys(%adhocroles)) {
-            my @adhoc = split(',',$adhocroles{'adhocroles.'.$dom});
-            if (@adhoc > 1) {
-                if ($type eq 'Community') {
-                    $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].',
-                                  join(', ',@adhoc));
-                } else {
-                    $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].',
-                                  join(', ',@adhoc));
-                }
-            } else {
-                if ($type eq 'Community') {
-                    $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]);
-                } else {
-                    $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]);
-                }
-            }
-        }
-        if ($type eq 'Community') {
-            $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);
-        } else {
-            $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
-        }
+        $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>');
     }
-    $r->print($actiontext.'<ul>');
-    if ($roleoption) {
-        $r->print('<li>'.$roleoption.'</li>'."\n");
-    }
-    $r->print('<li>'.$settingsoption.'</li>'."\n".'</ul>');
     return;
 }
 
@@ -244,7 +208,7 @@ sub print_course_selection_page {
     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,
-                                                    $dom,undef,%courses);
+                                                    undef,undef,%courses);
     return;
 }
 
@@ -265,7 +229,7 @@ sub get_filters {
 }
 
 sub print_modification_menu {
-    my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
+    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);
@@ -291,28 +255,25 @@ sub print_modification_menu {
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
         $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
         if (&showcredits($dom)) {
-            $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
+            $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, self-enrollment and table lifetime';
+            $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 $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.');
 
     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,$permission) = @_;
-        if ($permission->{'selfenroll'}) {
-            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;
-                }
-            }
+        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;
     }
@@ -327,7 +288,7 @@ sub print_modification_menu {
             {
                 linktext => $setparams_text,
                 url => &phaseurl('setparms'),
-                permission => $permission->{'setparms'},
+                permission => 1,
                 #help => '',
                 icon => 'crsconf.png',
                 linktitle => ''
@@ -335,7 +296,7 @@ sub print_modification_menu {
             {
                 linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
                 url => &phaseurl('setquota'),
-                permission => $permission->{'setquota'},
+                permission => 1,
                 #help => '',
                 icon => 'groupportfolioquota.png',
                 linktitle => ''
@@ -343,7 +304,7 @@ sub print_modification_menu {
             {
                 linktext => 'View/Modify responders threshold for anonymous survey submissions display',
                 url => &phaseurl('setanon'),
-                permission => $permission->{'setanon'},
+                permission => 1,
                 #help => '',
                 icon => 'anonsurveythreshold.png',
                 linktitle => ''
@@ -351,7 +312,7 @@ sub print_modification_menu {
             {
                 linktext => $cat_text,
                 url => &phaseurl('catsettings'),
-                permission => (($permission->{'catsettings'}) && (@additional_params > 0)),
+                permission => (@additional_params > 0),
                 #help => '',
                 icon => 'ccatconf.png',
                 linktitle => ''
@@ -359,7 +320,7 @@ sub print_modification_menu {
             {
                 linktext => 'Display current settings for automated enrollment',
                 url => &phaseurl('viewparms'),
-                permission => ($permission->{'viewparms'} && ($type ne 'Community')),
+                permission => ($type ne 'Community'),
                 #help => '',
                 icon => 'roles.png',
                 linktitle => ''
@@ -369,7 +330,7 @@ sub print_modification_menu {
                 icon => 'self_enroll.png',
                 #help => 'Course_Self_Enrollment',
                 url => &phaseurl('selfenroll'),
-                permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission),
+                permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
                 linktitle => 'Configure user self-enrollment.',
             },
             {
@@ -377,7 +338,7 @@ sub print_modification_menu {
                 icon => 'emblem-readonly.png',
                 #help => '',
                 url => &phaseurl('setpostsubmit'),
-                permission => $permission->{'setpostsubmit'},
+                permission => 1,
                 linktitle => '',
             },
         ]
@@ -406,28 +367,22 @@ sub print_modification_menu {
         }
         $menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
     }
-    $menu_html .= '<li>'.$mysqltables_text.'</li>'."\n".
-                  '<li>'.$setquota_text.'</li>'."\n".
+    $menu_html .= '<li>'.$setquota_text.'</li>'."\n".
                   '<li>'.$setuploadquota_text.'</li>'."\n".
                   '<li>'.$anon_text.'</li>'."\n".
                   '<li>'.$postsubmit_text.'</li>'."\n";
-    my ($categories_link_start,$categories_link_end);
-    if ($permission->{'catsettings'}) {
-        $categories_link_start = '<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">';
-        $categories_link_end = '</a>';
-    }
     foreach my $item (@additional_params) {
         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).',$categories_link_start,$categories_link_end).'</li>'."\n";
+                $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).',$categories_link_start,$categories_link_end).'</li>'."\n";
+                $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).',$categories_link_start,$categories_link_end).'</li>'."\n";
+                $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).',$categories_link_start,$categories_link_end).'</li>'."\n";
+                $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";
             }
         }
     }
@@ -443,47 +398,18 @@ sub print_modification_menu {
     return;
 }
 
-sub print_adhocrole_selected {
+sub print_ccrole_selected {
     my ($r,$type) = @_;
     &print_header($r,$type);
     my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
-    my ($newrole,$selectrole);
-    if (&Apache::lonnet::allowed('ccc',$cdom)) {
-        if ($type eq 'Community') {
-            $newrole = "co./$cdom/$cnum";
-        } else {
-            $newrole = "cc./$cdom/$cnum";
-        }
-        $selectrole = 1;
-    } elsif (&Apache::lonnet::allowed('rar',$cdom)) {
-        my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
-                                                         'adhocroles.'.$cdom);
-        if (keys(%adhocroles)) {
-            my $possrole = $env{'form.adhocrole'};
-            if ($possrole ne '') {
-                my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});
-                if (grep(/^\Q$possrole\E$/,@adhoc)) {
-                    my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
-                    $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
-                    $selectrole = 1;
-                }
-            }
-        }
-    }
-    if ($selectrole) {
-        $r->print('<form name="adhocrole" method="post" action="/adm/roles">
-<input type="hidden" name="selectrole" value="'.$selectrole.'" />
-<input type="hidden" name="newrole" value="'.$newrole.'" />
+    $r->print('<form name="ccrole" method="post" action="/adm/roles">
+<input type="hidden" name="selectrole" value="1" />
+<input type="hidden" name="newrole" value="cc./'.$cdom.'/'.$cnum.'" />
 </form>');
-    } else {
-        $r->print('<form name="ccrole" method="post" action="/adm/modifycourse">'.
-                  '</form>');
-    }
-    return;
 }
 
 sub print_settings_display {
-    my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_;
+    my ($r,$cdom,$cnum,$cdesc,$type) = @_;
     my %enrollvar = &get_enrollment_settings($cdom,$cnum);
     my %longtype = &course_settings_descrip($type);
     my %lt = &Apache::lonlocal::texthash(
@@ -524,35 +450,25 @@ sub print_settings_display {
     }
     $disp_table .= &Apache::loncommon::end_data_table()."\n";
     &print_header($r,$type);
-    my ($enroll_link_start,$enroll_link_end,$setparms_link_start,$setparms_link_end);
-    if (&Apache::lonnet::allowed('ccc',$cdom)) {
-        my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
-        my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
-                                             '=1&destinationurl=/adm/populate','&<>"');
-        $enroll_link_start = '<a href="'.$escuri.'">';
-        $enroll_link_end = '</a>';
-    }
-    if ($permission->{'setparms'}) {
-        $setparms_link_start = '<a href="javascript:changePage(document.viewparms,'."'setparms'".');">';
-        $setparms_link_end = '</a>';
-    }
+    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,$enroll_link_start,$enroll_link_end).'</li>');
+              '<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,$setparms_link_start,$setparms_link_end)."\n");
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
     } else {
-        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
     }
     $r->print('</li></ul></p>'.
               '<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
               '<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
               &hidden_form_elements().
               '</p></form>'
-    );
+     );
 }
 
 sub print_setquota {
@@ -718,7 +634,7 @@ sub domain_postsubtimeout {
     my ($cdom,$type,$settings) = @_;
     return unless (ref($settings) eq 'HASH'); 
     my $lctype = lc($type);
-    unless ($type eq 'Community') {
+    unless (($type eq 'Community') || ($type eq 'Placement')) {
         $lctype = 'unofficial';
         if ($settings->{'internal.coursecode'}) {
             $lctype = 'official';
@@ -837,8 +753,8 @@ sub print_course_modification_page {
     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',
-                                                       'internal.mysqltables'],$cdom,$cnum);
+                                                       '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'});
@@ -927,15 +843,15 @@ sub print_course_modification_page {
                       '&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");
+         }
+         $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();
@@ -986,12 +902,7 @@ sub print_course_modification_page {
                   &Apache::loncommon::end_data_table_row()."\n");
     }
     $r->print(&Apache::loncommon::end_data_table()."\n".
-              '<br />'.&Apache::lonhtmlcommon::row_closure().
-              &Apache::lonhtmlcommon::row_title(
-              &Apache::loncommon::help_open_topic('Modify_Course_Table_Lifetime').
-              '&nbsp;'.&mt('"Temporary" Tables Lifetime (s)'))."\n".
-              '<input type="text" size="10" name="mysqltables" value="'.$settings{'internal.mysqltables'}.'" />'.
-              &Apache::lonhtmlcommon::row_closure(1).
+              '<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') {
@@ -1113,7 +1024,7 @@ sub modify_course {
     my %longtype = &course_settings_descrip($type);
     my @items = ('internal.courseowner','description','internal.co-owners',
                  'internal.pendingco-owners','internal.selfenrollmgrdc',
-                 'internal.selfenrollmgrcc','internal.mysqltables');
+                 'internal.selfenrollmgrcc');
     my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles();
     unless ($type eq 'Community') {
         push(@items,('internal.coursecode','internal.authtype','internal.autharg',
@@ -1184,13 +1095,10 @@ sub modify_course {
                 $changed{'code'} = 1;
             }
         }
-        if ( exists($env{'form.mysqltables'}) ) {
-            $newattr{'mysqltables'} = $env{'form.mysqltables'};
-            $newattr{'mysqltables'} =~ s/\D+//g;
-        }
+
         if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
-            $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
             $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
+            $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
         }
     }
 
@@ -1282,8 +1190,6 @@ sub modify_course {
                         $shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles);
                     } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
                         $shown = &mt('None');
-                    } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
-                        $shown = &mt('domain default');
                     }
                     $chgresponse .= '<li>'.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'</li>';
                 } else {
@@ -1294,8 +1200,6 @@ sub modify_course {
                         $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
                     } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
                         $shown = &mt('None');
-                    } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
-                        $shown = &mt('domain default');
                     }
                     $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
                 }
@@ -1367,8 +1271,6 @@ sub modify_course {
                 $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles);
             } elsif (($attr eq 'defaultcredits') && ($shown eq '')) {
                 $shown = &mt('None');
-            } elsif (($attr eq 'mysqltables') && ($shown eq '')) {
-                $shown = &mt('domain default');
             }
             $nochgresponse .= '<li>'.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'</li>';
         }
@@ -2124,9 +2026,9 @@ ENDSCRIPT
 
     }
     my $starthash;
-    if ($env{'form.phase'} eq 'adhocrole') {
+    if ($env{'form.phase'} eq 'ccrole') {
         $starthash = {
-           add_entries => {'onload' => "javascript:document.adhocrole.submit();"},
+           add_entries => {'onload' => "javascript:document.ccrole.submit();"},
                      };
     } elsif ($phase eq 'courselist') {
         $starthash = {
@@ -2193,7 +2095,6 @@ sub course_settings_descrip {
                       '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",
-                      'mysqltables'      => '"Temporary" student performance tables lifetime (seconds)',
          );
     } else {
          %longtype = &Apache::lonlocal::texthash(
@@ -2212,10 +2113,9 @@ sub course_settings_descrip {
                       'sectionnums' => 'Course section number:LON-CAPA section',
                       'crosslistings' => 'Crosslisted class:LON-CAPA section',
                       'defaultcredits' => 'Credits',
-                      'autodropfailsafe' => "Failsafe section enrollment count",
                       'selfenrollmgrdc'  => "Course-specific self-enrollment configuration by Domain Coordinator",
                       'selfenrollmgrcc'  => "Course-specific self-enrollment configuration by Course personnel",
-                      'mysqltables'      => '"Temporary" student performance tables lifetime (seconds)',
+
          );
     }
     return %longtype;
@@ -2228,7 +2128,7 @@ sub hidden_form_elements {
           'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
           'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota',
           'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st',
-          'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n".
+          'sections','newsec'],['^selfenrollmgr_'])."\n".
           '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />';
     return $hidden_elements;
 }
@@ -2241,34 +2141,6 @@ sub showcredits {
     }
 }
 
-sub get_permission {
-    my ($dom) = @_;
-    my ($allowed,%permission);
-    if (&Apache::lonnet::allowed('ccc',$dom)) {
-        $allowed = 1;
-        %permission = (
-            setquota          => 1,
-            processquota      => 1,
-            setanon           => 1,
-            processthreshold  => 1,
-            setpostsubmit     => 1,
-            processpostsubmit => 1,
-            viewparms         => 1,
-            setparms          => 1,
-            processparms      => 1,
-            catsettings       => 1,
-            processcat        => 1,
-            selfenroll        => 1,
-        );
-    } elsif (&Apache::lonnet::allowed('rar',$dom)) {
-        $allowed = 1;
-        %permission = (
-            viewparms => 1,
-        );
-    }
-    return ($allowed,\%permission);
-}
-
 sub handler {
     my $r = shift;
     if ($r->header_only) {
@@ -2279,8 +2151,8 @@ sub handler {
 
     my $dom = $env{'request.role.domain'};
     my $domdesc = &Apache::lonnet::domain($dom,'description');
-    my ($allowed,$permission) = &get_permission($dom);
-    if ($allowed) {
+
+    if (&Apache::lonnet::allowed('ccc',$dom)) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
 
@@ -2331,24 +2203,23 @@ sub handler {
                         ({href=>"javascript:changePage(document.$phase,'menu')",
                           text=>"Pick action"});
                         &print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
-                                                 $env{'form.pickedcourse'},$coursehash,
-                                                 $permission);
-                    } elsif ($phase eq 'adhocrole') {
+                                                 $env{'form.pickedcourse'},$coursehash);
+                    } elsif ($phase eq 'ccrole') {
                         &Apache::lonhtmlcommon::add_breadcrumb
-                         ({href=>"javascript:changePage(document.$phase,'adhocrole')",
+                         ({href=>"javascript:changePage(document.$phase,'ccrole')",
                            text=>$enter_text});
-                        &print_adhocrole_selected($r,$type);
+                        &print_ccrole_selected($r,$type);
                     } else {
                         &Apache::lonhtmlcommon::add_breadcrumb
                         ({href=>"javascript:changePage(document.$phase,'menu')",
                           text=>"Pick action"});
                         my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
-                        if (($phase eq 'setquota') && ($permission->{'setquota'})) {
+                        if ($phase eq 'setquota') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Set quota"});
                             &print_setquota($r,$cdom,$cnum,$cdesc,$type);
-                        } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { 
+                        } elsif ($phase eq 'processquota') { 
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'setquota')",
                               text=>"Set quota"});
@@ -2356,12 +2227,12 @@ sub handler {
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
                             &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type);
-                        } elsif (($phase eq 'setanon') && ($permission->{'setanon'})) {
+                        } 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') && ($permission->{'processthreshold'})) {
+                        } elsif ($phase eq 'processthreshold') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'setanon')",
                               text=>"Threshold for anonymous submissions display"});
@@ -2369,27 +2240,27 @@ sub handler {
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
                             &modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type);
-                        } elsif (($phase eq 'setpostsubmit') && ($permission->{'setpostsubmit'})) {
+                        } 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') && ($permission->{'processpostsubmit'})) {
+                        } 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') && ($permission->{'viewparms'})) {
+                        } elsif ($phase eq 'viewparms') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'viewparms')",
                               text=>"Display settings"});
-                            &print_settings_display($r,$cdom,$cnum,$cdesc,$type,$permission);
-                        } elsif (($phase eq 'setparms') && ($permission->{'setparms'})) {
+                            &print_settings_display($r,$cdom,$cnum,$cdesc,$type);
+                        } elsif ($phase eq 'setparms') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Change settings"});
                             &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type);
-                        } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) {
+                        } elsif ($phase eq 'processparms') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'setparms')",
                               text=>"Change settings"});
@@ -2397,12 +2268,12 @@ sub handler {
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
                             &modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type);
-                        } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) {
+                        } elsif ($phase eq 'catsettings') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Catalog settings"});
                             &print_catsettings($r,$cdom,$cnum,$cdesc,$type);
-                        } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) {
+                        } elsif ($phase eq 'processcat') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'catsettings')",
                               text=>"Catalog settings"});
@@ -2410,7 +2281,7 @@ sub handler {
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>"Result"});
                             &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type);
-                        } elsif (($phase eq 'selfenroll') && ($permission->{'selfenroll'})) {
+                        } elsif ($phase eq 'selfenroll') {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href => "javascript:changePage(document.$phase,'$phase')",
                               text => "Self-enrollment settings"});