--- loncom/interface/lonmodifycourse.pm	2011/01/11 22:09:49	1.58
+++ loncom/interface/lonmodifycourse.pm	2014/03/31 01:37:28	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.58 2011/01/11 22:09:49 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.71 2014/03/31 01:37:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,18 +39,22 @@ use lib '/home/httpd/lib/perl';
 use LONCAPA;
 
 sub get_dc_settable {
-    my ($type) = @_;
+    my ($type,$cdom) = @_;
     if ($type eq 'Community') {
         return ('courseowner');
     } else {
-        return ('courseowner','coursecode','authtype','autharg');
+        my @items = ('courseowner','coursecode','authtype','autharg');
+        if (&showcredits($cdom)) {
+            push(@items,'defaultcredits');
+        }
+        return @items;
     }
 }
 
 sub autoenroll_keys {
-    my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops',
-                         'autostart','autoend','sectionnums','crosslistings',
-                         'co-owners'];
+    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);
 }
@@ -114,6 +118,10 @@ sub get_enrollment_settings {
                      || $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 'courseowner') {
                 if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
                     $enrollvar{$type} = $settings{$item};
@@ -145,10 +153,7 @@ sub print_course_search_page {
         $type = 'Course';
     }
     &print_header($r,$type);
-    my $filterlist = ['descriptfilter',
-                      'instcodefilter','ownerfilter',
-                      'coursefilter'];
-    my $filter = {};
+    my ($filterlist,$filter) = &get_filters($dom);
     my ($numtitles,$cctitle,$dctitle,@codetitles);
     my $ccrole = 'cc';
     if ($type eq 'Community') {
@@ -156,15 +161,15 @@ sub print_course_search_page {
     }
     $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     $dctitle = &Apache::lonnet::plaintext('dc');
-    $r->print(&Apache::lonpickcourse::js_changer());
+    $r->print(&Apache::loncommon::js_changer());
     if ($type eq 'Community') {
         $r->print('<h3>'.&mt('Search for a community in the [_1] domain',$domdesc).'</h3>');
     } else {
         $r->print('<h3>'.&mt('Search for a course in the [_1] domain',$domdesc).'</h3>');
-    }   
-    $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                             undef,undef,$filter,$action,\$numtitles,'modifycourse',
-                             undef,undef,undef,\@codetitles));
+    }
+    $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
+                                                \$numtitles,'modifycourse',undef,undef,undef,
+                                                \@codetitles,$dom));
     if ($type eq 'Community') {
         $r->print(&mt('Actions available after searching for a community:').'<ul>'.
                   '<li>'.&mt('Enter the community with the role of [_1]',$cctitle).'</li>'."\n".
@@ -176,6 +181,7 @@ sub print_course_search_page {
                   '<li>'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
                   '</li>'."\n".'</ul>');
     }
+    return;
 }
 
 sub print_course_selection_page {
@@ -187,45 +193,69 @@ sub print_course_selection_page {
     &print_header($r,$type);
 
 # Criteria for course search 
-    my $filterlist = ['descriptfilter',
-                      'instcodefilter','ownerfilter',
-                      'ownerdomfilter','coursefilter'];
-    my %filter;
+    my ($filterlist,$filter) = &get_filters();
     my $action = '/adm/modifycourse';
     my $dctitle = &Apache::lonnet::plaintext('dc');
     my ($numtitles,@codetitles);
-    $r->print(&Apache::lonpickcourse::js_changer());
+    $r->print(&Apache::loncommon::js_changer());
     $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').<br />');
-    $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
-                                       undef,undef,\%filter,$action,\$numtitles,
-                                       undef,undef,undef,undef,\@codetitles));
-    $filter{'domainfilter'} = $dom;
-    my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
-                                                         \%filter,$numtitles,undef,
-                                                         undef,undef,\@codetitles);
+    $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
+                                                \$numtitles,'modifycourse',undef,undef,undef,
+                                                \@codetitles,$dom,$env{'form.form'}));
+    my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
+                                                     undef,undef,undef,\@codetitles);
     &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
                                                     %courses);
     return;
 }
 
+sub get_filters {
+    my ($dom) = @_;
+    my @filterlist = ('descriptfilter','instcodefilter','ownerfilter',
+                      'ownerdomfilter','coursefilter','sincefilter');
+    # created filter
+    my $loncaparev = &Apache::lonnet::get_server_loncaparev($dom);
+    if ($loncaparev ne 'unknown_cmd') {
+        push(@filterlist,'createdfilter');
+    }
+    my %filter;
+    foreach my $item (@filterlist) {
+        $filter{$item} = $env{'form.'.$item};
+    }
+    return (\@filterlist,\%filter);
+}
+
 sub print_modification_menu {
-    my ($r,$cdesc,$domdesc,$dom,$type) = @_;
+    my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
     &print_header($r,$type);
-    my ($ccrole,$categorytitle,$setquota_text,$setparams_text,$cat_text);
+    my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
+        $cdom,$cnum);
+    if (ref($coursehash) eq 'HASH') {
+        $cdom = $coursehash->{'domain'};
+        $cnum = $coursehash->{'num'};
+    } else {
+         ($cdom,$cnum) = split(/_/,$cid);
+    }
     if ($type eq 'Community') {
         $ccrole = 'co';
     } else {
         $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.');
-        $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
+        $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
+        if (&showcredits($dom)) {
+            $setparams_text = 'View/Modify course owner, institutional code, and default authentication and credits';
+        } else {
+            $setparams_text = 'View/Modify course owner, institutional code, and default authentication';
+        }
         $cat_text = 'View/Modify catalog settings for course';
     }
     my $anon_text = 'Responder threshold required to display anonymous survey submissions';
@@ -249,7 +279,7 @@ sub print_modification_menu {
                 linktitle => ''
             },
             {
-                linktext => 'View/Modify quota for group portfolio files',
+                linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
                 url => &phaseurl('setquota'),
                 permission => 1,
                 #help => '',
@@ -300,8 +330,12 @@ sub print_modification_menu {
     } else {
         $menu_html .=  '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'.
                        '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>';
+        if (&showcredits($dom)) {
+            $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>';
+        }
     }
     $menu_html .= '<li>'.$setquota_text.'</li>'.
+                  '<li>'.$setuploadquota_text.'</li>'.
                   '<li>'.$anon_text.'</li>'."\n";
     foreach my $item (@additional_params) {
         if ($type eq 'Community') {
@@ -357,7 +391,7 @@ sub print_settings_display {
     }
     my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
     my $dctitle = &Apache::lonnet::plaintext('dc');
-    my @modifiable_params = &get_dc_settable($type);
+    my @modifiable_params = &get_dc_settable($type,$cdom);
     my ($internals,$accessdates) = &autoenroll_keys();
     my @items;
     if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
@@ -389,9 +423,13 @@ sub print_settings_display {
               ' <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>'.
-              '<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n".
-              '</li></ul></p>'.
+              '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',$cctitle,'<a href="'.$escuri.'">','</a>').'</li>');
+    if (&showcredits($cdom)) {
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication and credits[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+    } else {
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, and default authentication[_3].',$dctitle,'<a href="javascript:changePage(document.viewparms,'."'setparms'".');">','</a>')."\n");
+    }
+    $r->print('</li></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().
@@ -401,28 +439,57 @@ sub print_settings_display {
 
 sub print_setquota {
     my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+    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 for:',
-                'gpqu' => 'Course portfolio files disk space',
+                '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',
     );
-    if ($type eq 'Community') {
-        $lt{'gpqu'} = &mt('Community portfolio files disk space');
-    }
-    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);
+        if ($type eq 'Community') {
+            $uploadquota = $domdefs{$lctype.'quota'};
+        } elsif ($settings{'internal.coursecode'}) {
+            $uploadquota = $domdefs{'officialquota'};
+        } elsif ($settings{'internal.textbook'}) {
+            $uploadquota = $domdefs{'textbookquota'};
+        } else {
+            $uploadquota = $domdefs{'unofficialquota'};
+        }
+        if ($uploadquota eq '') {
+            $uploadquota = $staticdefaults{'uploadquota'};
+        }
     }
     &print_header($r,$type);
     my $hidden_elements = &hidden_form_elements();
-    my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota');
+    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" onsubmit="return verify_quota();">
-<h3>$lt{'cquo'} <span class="LC_nobreak">$cdesc</span></h3>
+<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>
-$helpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" /> Mb &nbsp;&nbsp;&nbsp;&nbsp;
 <input type="submit" value="$lt{'modi'}" />
 </p>
 $hidden_elements
@@ -639,14 +706,21 @@ sub print_course_modification_page {
                       &Apache::loncommon::help_open_topic('Modify_Course_Instcode').
                       '&nbsp;'.&mt('Course Code'))."\n".
                   '<input type="text" size="10" name="coursecode" value="'.$enrollvar{'coursecode'}.'" />'.
-                  &Apache::lonhtmlcommon::row_closure().
-                  &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').
+                  &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");
     }
     $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1).
@@ -657,7 +731,7 @@ sub print_course_modification_page {
     } else {
         $r->print('javascript:verify_message(this.form);"');
     }
-    $r->print('value="'.$lt{'gobt'}.'" /></p></form>');
+    $r->print(' value="'.$lt{'gobt'}.'" /></p></form>');
     return;
 }
 
@@ -718,12 +792,15 @@ sub modify_course {
     unless ($type eq 'Community') {
         push(@items,('internal.coursecode','internal.authtype','internal.autharg',
                      'internal.sectionnums','internal.crosslistings'));
+        if (&showcredits($cdom)) {  
+            push(@items,'internal.defaultcredits');
+        }
     }
     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);
+    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};
     }
@@ -742,7 +819,7 @@ sub modify_course {
                 $sections[0] = $settings{'internal.sectionnums'};
             }
         }
-        unless ($settings{'internal.crosslistings'} eq'') {
+        unless ($settings{'internal.crosslistings'} eq '') {
             if ($settings{'internal.crosslistings'} =~ m/,/) {
                 @xlists = split/,/,$settings{'internal.crosslistings'};
             } else {
@@ -781,6 +858,12 @@ sub modify_course {
                 $changed{'code'} = 1;
             }
         }
+
+        if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) {
+            $newattr{'defaultcredits'} =~ s/[^\d\.]//g;
+            $newattr{'defaultcredits'}=$env{'form.defaultcredits'};
+        }
+
     }
 
     if ( exists($env{'form.courseowner'}) ) {
@@ -816,10 +899,10 @@ sub modify_course {
         }
     }
     if (@changes > 0) {
-        $chgresponse = &mt("The following settings have been changed:<br/><ul>");
+        $chgresponse = &mt('The following settings have been changed:').'<br/><ul>';
     }
     if (@nochanges > 0) {
-        $nochgresponse = &mt("The following settings remain unchanged:<br/><ul>");
+        $nochgresponse = &mt('The following settings remain unchanged:').'<br/><ul>';
     }
     if (@changes > 0) {
         my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
@@ -845,10 +928,10 @@ sub modify_course {
 	            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'}) {
-                            my %crsenv = &Apache::lonnet::get('environment',['internal.co-owners'],$cdom,$cnum);
-                            my $coowners = $crsenv{'internal.co-owners'};
 	                    foreach my $sec (@sections) {
 		                if ($sec =~ m/^(.+):/) {
                                     my $instsec = $1;
@@ -929,18 +1012,19 @@ sub modify_course {
     $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
              '<p>'.$reply.'</p>'."\n".
              '<form action="/adm/modifycourse" method="post" name="processparms">'.
-             &hidden_form_elements().
-             '<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
-             &mt('Pick another action').'</a>';
+             &hidden_form_elements();
+    my @actions =
+        ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
+                 &mt('Pick another action').'</a>');
     if ($numwarnings) {
         my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
         my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
                                              '=1&destinationurl=/adm/populate','&<>"');
 
-        $reply .= '<br /><a href="'.$escuri.'">'.
-                  &mt('Go to Automated Enrollment Manager for course').'</a>';
+        push(@actions, '<a href="'.$escuri.'">'.
+                  &mt('Go to Automated Enrollment Manager for course').'</a>');
     }
-    $reply .= '</form>';
+    $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
     $r->print($reply);
     return;
 }
@@ -1091,58 +1175,104 @@ sub update_coowners {
 sub modify_quota {
     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>'.&mt('Disk space for storage of group portfolio files for:').
-              ' <span class="LC_nobreak">'.$cdesc.'</span></h3><br />');
-    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 [_1] Mb.',$env{'form.coursequota'}));
+              '<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 {
-                my %cenv = (
-                           'internal.coursequota' => $env{'form.coursequota'},
-                           );
-                my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
-                                                    $cnum);
-                if (($oldsettings{'internal.coursequota'} eq '') && 
-                    ($env{'form.coursequota'} == $defaultquota)) {
+                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 />');
+
+                }
+            }
+        }
+    }
+    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 group portfolio files in this community is the default quota for this domain: [_1] Mb.',$defaultquota));
+                        $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 group portfolio files in this course is the default quota for this domain: [_1] Mb.',$defaultquota));
+                        $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 ($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: [_1] Mb.','<b>'.$updatedsettings{'internal.coursequota'}.'</b>'));
-                        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 [_1] exceeds the quota for this community.',$newoverquota).' '.
-                                          &mt('Upload of new portfolio files and assignment of a non-zero Mb quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.'));
-                            } else {
-                                $r->print(&mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '.
-                                          &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>');
-                        }
+                } 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('An error occurred storing the quota for group portfolio files: ').
-                                  $putreply);
+                        $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('The new quota requested contained invalid characters, so the quota is unchanged.'));
+            $r->print(&mt('An error occurred storing the quota(s) for group portfolio files and/or uploaded content: ').
+                      $putreply);
         }
     }
     $r->print('<p>'.
@@ -1345,7 +1475,7 @@ sub print_header {
         $phase = $env{'form.phase'};
     }
     my $js = qq|
-<script type="text/javascript">
+
 function changePage(formname,newphase) {
     formname.phase.value = newphase;
     if (newphase == 'processparms') {
@@ -1353,29 +1483,32 @@ 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') {
         my $invalid = &mt('The quota you entered contained invalid characters.');
         my $alert = &mt('You must enter a number');
         my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/';
         $js .= <<"ENDSCRIPT";
-<script type="text/javascript">
+
 function verify_quota() {
     var newquota = document.setquota.coursequota.value; 
     var num_reg = $regexp;
@@ -1387,14 +1520,14 @@ function verify_quota() {
     }
     return true;
 }
-</script>
+
 ENDSCRIPT
     } elsif ($phase eq 'setanon') {
         my $invalid = &mt('The responder threshold you entered is invalid.');
         my $alert = &mt('You must enter a positive integer.');
         my $regexp = ' /^\s*\d+\s*$/';
         $js .= <<"ENDSCRIPT";
-<script type="text/javascript">
+
 function verify_anon_threshold() {
     var newthreshold = document.setanon.threshold.value;
     var num_reg = $regexp;
@@ -1411,17 +1544,23 @@ function verify_anon_threshold() {
     }
     return true;
 }
-</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();"},
+                     };
     }
     $r->print(&Apache::loncommon::start_page('View/Modify Course/Community Settings',
-					     $js,$starthash));
+					     &Apache::lonhtmlcommon::scripttag($js),
+                                             $starthash));
     my $bread_text = "View/Modify Courses/Communities";
     if ($type eq 'Community') {
         $bread_text = 'Community Settings';
@@ -1439,38 +1578,35 @@ sub print_footer {
 }
 
 sub check_course {
-    my ($r,$dom,$domdesc) = @_;
-    my ($ok_course,$description,$instcode,$owner);
-    my %args = (
-                 one_time => 1,
-               );
-    my %coursehash = 
-        &Apache::lonnet::coursedescription($env{'form.pickedcourse'},\%args);
-    my $cnum = $coursehash{'num'};
-    my $cdom = $coursehash{'domain'};
-    if ($cdom eq $dom) {
-        my $description;
-        my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
-                                                      $cnum,undef,undef,'.');
-        if (keys(%courseIDs) > 0) {
-            $ok_course = 'ok';
-            my ($instcode,$owner);
-            if (ref($courseIDs{$cdom.'_'.$cnum}) eq 'HASH') {
-                $description = $courseIDs{$cdom.'_'.$cnum}{'description'};
-                $instcode = $courseIDs{$cdom.'_'.$cnum}{'inst_code'};
-                $owner = $courseIDs{$cdom.'_'.$cnum}{'owner'};          
-            } else {
-                ($description,$instcode,$owner) = 
-                                   split(/:/,$courseIDs{$cdom.'_'.$cnum});
-            }
-            $description = &unescape($description);
-            $instcode = &unescape($instcode);
-            if ($instcode) {
-                $description .= " ($instcode)";
+    my ($dom,$domdesc) = @_;
+    my ($ok_course,$description,$instcode);
+    my %coursehash;
+    if ($env{'form.pickedcourse'} =~ /^$match_domain\_$match_courseid$/) {
+        my %args;
+        unless ($env{'course.'.$env{'form.pickedcourse'}.'.description'}) {
+            %args = (
+                      'one_time'      => 1,
+                      'freshen_cache' => 1,
+                    );
+        }
+        %coursehash =
+           &Apache::lonnet::coursedescription($env{'form.pickedcourse'},\%args);
+        my $cnum = $coursehash{'num'};
+        my $cdom = $coursehash{'domain'};
+        $description = $coursehash{'description'};
+        $instcode = $coursehash{'internal.coursecode'};
+        if ($instcode) {
+            $description .= " ($instcode)";
+        }
+        if (($cdom eq $dom) && ($cnum =~ /^$match_courseid$/)) {
+            my %courseIDs = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',
+                                                          $cnum,undef,undef,'.');
+            if ($courseIDs{$cdom.'_'.$cnum}) {
+                $ok_course = 'ok';
             }
-            return ($ok_course,$description);
         }
     }
+    return ($ok_course,$description,\%coursehash);
 }
 
 sub course_settings_descrip {
@@ -1497,6 +1633,7 @@ sub course_settings_descrip {
                       'notifylist' => 'Course Coordinators to be notified of enrollment changes',
                       'sectionnums' => 'Course section number:LON-CAPA section',
                       'crosslistings' => 'Crosslisted class:LON-CAPA section',
+                      'defaultcredits' => 'Credits', 
          );
     }
     return %longtype;
@@ -1507,11 +1644,19 @@ sub hidden_form_elements {
       &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
           'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
           'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
-          'threshold'])."\n".
+          'threshold','defaultcredits','uploadquota'])."\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) {
@@ -1559,7 +1704,7 @@ sub handler {
             if ($phase eq 'courselist') {
                 &print_course_selection_page($r,$dom,$domdesc);
             } else {
-                my ($checked,$cdesc) = &check_course($r,$dom,$domdesc);
+                my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc);
                 if ($checked eq 'ok') {
                     my $enter_text;
                     if ($type eq 'Community') {
@@ -1571,7 +1716,8 @@ sub handler {
                         &Apache::lonhtmlcommon::add_breadcrumb
                         ({href=>"javascript:changePage(document.$phase,'menu')",
                           text=>"Pick action"});
-                        &print_modification_menu($r,$cdesc,$domdesc,$dom,$type);
+                        &print_modification_menu($r,$cdesc,$domdesc,$dom,$type,
+                                                 $env{'form.pickedcourse'},$coursehash);
                     } elsif ($phase eq 'ccrole') {
                         &Apache::lonhtmlcommon::add_breadcrumb
                          ({href=>"javascript:changePage(document.$phase,'ccrole')",