--- loncom/interface/domainprefs.pm	2023/06/03 19:26:31	1.426
+++ loncom/interface/domainprefs.pm	2023/07/29 20:33:25	1.428
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.426 2023/06/03 19:26:31 raeburn Exp $
+# $Id: domainprefs.pm,v 1.428 2023/07/29 20:33:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -568,7 +568,7 @@ sub handler {
                   modify => \&modify_selfenrollment,
                  },
         'privacy' => 
-                 {text   => 'Availability of User Information',
+                 {text   => 'Role assignments and user privacy',
                   help   => 'Domain_Configuration_User_Privacy',
                   header => [{col1 => 'Role assigned in different domain',
                               col2 => 'Approval options'},
@@ -882,7 +882,7 @@ sub process_changes {
     } elsif ($action eq 'lti') {
         $output = &modify_lti($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'privacy') {
-        $output = &modify_privacy($dom,%domconfig);
+        $output = &modify_privacy($dom,$lastactref,%domconfig);
     } elsif ($action eq 'passwords') {
         $output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'wafproxy') {
@@ -6789,6 +6789,7 @@ sub print_coursedefaults {
     my %choices =  &Apache::lonlocal::texthash (
         canuse_pdfforms      => 'Course/Community users can create/upload PDF forms',
         uploadquota          => 'Default quota for files uploaded directly to course/community using Course Editor (MB)',
+        coursequota          => 'Default cumulative quota for all group portfolio spaces in course',
         anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
         coursecredits        => 'Credits can be specified for courses',
         uselcmath            => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
@@ -6805,6 +6806,7 @@ sub print_coursedefaults {
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
+                           coursequota          => 20,
                            postsubmit           => 60,
                            mysqltables          => 172800,
                            domexttool           => 1,
@@ -6922,7 +6924,8 @@ sub print_coursedefaults {
         $itemcount ++;
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
+        my ($currdefresponder,%defcredits,%curruploadquota,%currcoursequota,
+            %deftimeout,%currmysql);
         my $currusecredits = 0;
         my $postsubmitclient = 1;
         my $ltiauth = 0;
@@ -6959,6 +6962,11 @@ sub print_coursedefaults {
                     $curruploadquota{$type} = $settings->{'uploadquota'}{$type};
                 }
             }
+            if (ref($settings->{'coursequota'}) eq 'HASH') {
+                foreach my $type (keys(%{$settings->{'coursequota'}})) {
+                    $currcoursequota{$type} = $settings->{'coursequota'}{$type};
+                }
+            }
             if (ref($settings->{'coursecredits'}) eq 'HASH') {
                 foreach my $type (@types) {
                     next if ($type eq 'community');
@@ -7018,6 +7026,9 @@ sub print_coursedefaults {
             if ($curruploadquota{$type} eq '') {
                 $curruploadquota{$type} = $staticdefaults{'uploadquota'};
             }
+            if ($currcoursequota{$type} eq '') {
+                $currcoursequota{$type} = $staticdefaults{'coursequota'};
+            }
         }
         $datatable .=
                 '<tr'.$css_class.'><td><span class="LC_nobreak">'.
@@ -7041,6 +7052,19 @@ sub print_coursedefaults {
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'coursequota'}.
+                      '</span></td>'.
+                      '<td style="text-align: right" class="LC_right_item">'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $datatable .= '<td style="text-align: center">'.&mt($type).'<br />'.
+                           '<input type="text" name="coursequota_'.$type.'"'.
+                           ' value="'.$currcoursequota{$type}.'" size="5" /></td>';
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
+        $itemcount ++;
         my $onclick = "toggleDisplay(this.form,'credits');";
         my $display = 'none';
         if ($currusecredits) {
@@ -17096,7 +17120,7 @@ sub modify_contacts {
 }
 
 sub modify_privacy {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,%current,%changes);
     if (ref($domconfig{'privacy'}) eq 'HASH') {
         %current = %{$domconfig{'privacy'}};
@@ -17332,6 +17356,28 @@ sub modify_privacy {
                 }
             }
             $resulttext .= '</ul>';
+            if ($changes{'approval'}) {
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                delete($domdefaults{'userapprovals'});
+                if (ref($privacyhash{'approval'}) eq 'HASH') {
+                    foreach my $domtype ('instdom','extdom') {
+                        if (ref($privacyhash{'approval'}{$domtype}) eq 'HASH') {
+                            foreach my $roletype ('domain','author','course','community') {
+                                if ($privacyhash{'approval'}{$domtype}{$roletype} eq 'user') {
+                                    $domdefaults{'userapprovals'} = 1;
+                                    last;
+                                }
+                            }
+                        }
+                        last if ($domdefaults{'userapprovals'});               
+                    }
+                }
+                my $cachetime = 24*60*60;
+                &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
         } else {
             $resulttext = &mt('No changes made to user information settings');
         }
@@ -20469,12 +20515,15 @@ sub modify_coursedefaults {
     my @toggles = ('canuse_pdfforms','uselcmath','usejsme','inline_chem','ltiauth');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
                    'uploadquota_community','uploadquota_textbook','uploadquota_placement',
-                   'mysqltables_official','mysqltables_unofficial','mysqltables_community',
-                   'mysqltables_textbook','mysqltables_placement');
+                   'coursequota_official','coursequota_unofficial','coursequota_community',
+                   'coursequota_textbook','coursequota_placement','mysqltables_official',
+                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook',
+                   'mysqltables_placement');
     my @types = ('official','unofficial','community','textbook','placement');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
+                           coursequota          => 20,
                            postsubmit           => 60,
                            mysqltables          => 172800,
                            domexttool           => 1,
@@ -20522,7 +20571,7 @@ sub modify_coursedefaults {
                 }
                 $defaultshash{'coursedefaults'}{$item} = $newdef;
             } else {
-                my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/);
+                my ($setting,$type) = ($item =~ /^(uploadquota|coursequota|mysqltables)_(\w+)$/);
                 if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
                     $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
                 }
@@ -20534,7 +20583,7 @@ sub modify_coursedefaults {
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
                         $changes{$item} = 1;
                     }
-                } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
+                } elsif ($item =~ /^(uploadquota|coursequota|mysqltables)_/) {
                     my $setting = $1;
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
                         $changes{$setting} = 1;
@@ -20720,7 +20769,7 @@ sub modify_coursedefaults {
                 ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
                 ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) ||
                 ($changes{'inline_chem'}) || ($changes{'ltiauth'}) || ($changes{'domexttool'}) ||
-                ($changes{'exttool'}) ) {
+                ($changes{'exttool'}) || ($changes{'coursequota'})) {
                 foreach my $item ('canuse_pdfforms','uselcmath','usejsme','inline_chem','texengine',
                                   'ltiauth') {
                     if ($changes{$item}) {
@@ -20753,6 +20802,13 @@ sub modify_coursedefaults {
                         }
                     }
                 }
+                if ($changes{'coursequota'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'coursequota'}) eq 'HASH') {
+                        foreach my $type (@types) {
+                            $domdefaults{$type.'coursequota'}=$defaultshash{'coursedefaults'}{'coursequota'}{$type};
+                        }
+                    }
+                }
                 if ($changes{'canclone'}) {
                     if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') {
                         if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
@@ -20831,6 +20887,19 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>';
                     }
+                } elsif ($item eq 'coursequota') {
+                    if (ref($defaultshash{'coursedefaults'}{'coursequota'}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Default cumulative quota for all group portfolio spaces in course set as follows:').'<ul>'.
+                                       '<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'official'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'unofficial'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'textbook'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Placement tests: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'placement'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'community'}.'</b>').'</li>'.
+                                       '</ul>'.
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Default cumulative quota for all group portfolio spaces in course remains default: [_1] MB',$staticdefaults{'coursequota'}).'</li>';
+                    }
                 } elsif ($item eq 'mysqltables') {
                     if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') {
                         $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'.