--- loncom/interface/domainprefs.pm	2024/04/14 17:12:27	1.438
+++ loncom/interface/domainprefs.pm	2024/12/31 18:51:53	1.446
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.438 2024/04/14 17:12:27 raeburn Exp $
+# $Id: domainprefs.pm,v 1.446 2024/12/31 18:51:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -472,6 +472,8 @@ sub handler {
                     header => [{col1 => 'Target user has role',
                                 col2 => 'User information updatable in author context'},
                                {col1 => 'Target user has role',
+                                col2 => 'User information updatable by co-author manager'},
+                               {col1 => 'Target user has role',
                                 col2 => 'User information updatable in course context'}],
                     print => \&print_usermodification,
                     modify => \&modify_usermodification,
@@ -1031,7 +1033,7 @@ sub print_config_box {
             ($action eq 'usersessions') || ($action eq 'coursecategories') || 
             ($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') ||
             ($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') ||
-            ($action eq 'ltitools')) {
+            ($action eq 'ltitools') || ($action eq 'usermodification')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -1135,9 +1137,9 @@ sub print_config_box {
                 }
             }
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+        } elsif (($action eq 'coursedefaults') || ($action eq 'authordefaults') ||
                  ($action eq 'directorysrch') || ($action eq 'helpsettings') ||
-                 ($action eq 'wafproxy') || ($action eq 'authordefaults')) {
+                 ($action eq 'wafproxy')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
@@ -2019,7 +2021,7 @@ sub print_rolecolors {
     my %choices = &color_font_choices();
     my @bgs = ('pgbg','tabbg','sidebg');
     my @links = ('link','alink','vlink');
-    my @images = ('img');
+    my @images = ();
     my %alt_text = &Apache::lonlocal::texthash(img => "Banner for $role role");
     my %designhash = &Apache::loncommon::get_domainconf($dom);
     my %defaultdesign = %Apache::loncommon::defaultdesign;
@@ -2027,10 +2029,6 @@ sub print_rolecolors {
     my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$role}) eq 'HASH') {
-            if ($settings->{$role}->{'img'} ne '') {
-                $designs{'img'} = $settings->{$role}->{'img'};
-                $is_custom{'img'} = 1;
-            }
             if ($settings->{$role}->{'font'} ne '') {
                 $designs{'font'} = $settings->{$role}->{'font'};
                 $is_custom{'font'} = 1;
@@ -2053,10 +2051,6 @@ sub print_rolecolors {
             }
         }
     } else {
-        if ($designhash{$dom.'.'.$role.'.img'} ne '') {
-            $designs{img} = $designhash{$dom.'.'.$role.'.img'};
-            $is_custom{'img'} = 1;
-        }
         if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
             $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
             $is_custom{'fontmenu'} = 1; 
@@ -2106,7 +2100,6 @@ sub role_defaults {
         }
     } else {
         %defaults = (
-                       img => $defaultdesign{$role.'.img'},
                        font => $defaultdesign{$role.'.font'},
                        fontmenu => $defaultdesign{$role.'.fontmenu'},
                     );
@@ -7523,6 +7516,15 @@ sub print_authordefaults {
         }
         $datatable .= '</td></tr>';
         $itemcount ++;
+        my %defchecked = (
+                                'archive' => 'off',
+                             );
+        my @toggles = ('archive');
+        (my $archive,$itemcount) = &radiobutton_prefs($settings,['archive'],
+                                                      {'archive' => 'off'},
+                                                      \%titles,$itemcount);
+        $datatable .= $archive."\n";
+        $itemcount ++;
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -7546,6 +7548,7 @@ sub authordefaults_titles {
                none => 'No override set',
                overon => 'Override -- webDAV on',
                overoff => 'Override -- webDAV off',
+               archive => 'Authors can download tar.gz file of Authoring Space',
     );
 }
 
@@ -10714,6 +10717,15 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
+    } elsif ($position eq 'middle') {
+        $rowcount = 0;
+        $context = 'coauthor';
+        foreach my $role ('ca','aa') {
+            $datatable .= &modifiable_userdata_row($context,$role,$settings,
+                                                   $numinrow,$rowcount);
+            $$rowtotal ++;
+            $rowcount ++;
+        }
     } elsif ($position eq 'bottom') {
         $context = 'course';
         $rowcount = 0;
@@ -12219,6 +12231,8 @@ sub modifiable_userdata_row {
         } else {
             if ($context eq 'lti') {
                 $prefix = 'lti';
+            } elsif ($context eq 'coauthor') {
+                $prefix = 'cacanmodify';
             } elsif ($context eq 'privacy') {
                 $prefix = 'privacy';
             }
@@ -13111,7 +13125,6 @@ sub check_exempt_addresses {
 sub color_font_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            img => "Header",
             bgs => "Background colors",
             links => "Link colors",
             images => "Images",
@@ -13166,13 +13179,15 @@ sub modify_ipaccess {
     foreach my $idx (@items) {
         my $itemid = $itemids{$idx};
         next unless ($itemid);
-        my %current;
-        unless ($idx eq 'add') {
+        my ($position,%current);
+        if ($idx eq 'add') {
+            $position = $env{'form.ipaccess_pos_add'};
+        } else {
+            $position = $env{'form.ipaccess_pos_'.$itemid};
             if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
                 %current = %{$domconfig{'ipaccess'}{$itemid}};
             }
         }
-        my $position = $env{'form.ipaccess_pos_'.$itemid};
         $position =~ s/\D+//g;
         if ($position ne '') {
             $allpos[$position] = $itemid;
@@ -13425,12 +13440,13 @@ sub modify_authordefaults {
                            'nocodemirror' => 'off',
                            'daxecollapse' => 'off',
                            'domcoordacc'  => 'on',
-                           'editors'      => ['edit','xml'].
+                           'editors'      => ['edit','xml'],
                            'authorquota'  => 500,
                            'webdav'       => 0,
+                           'archive'      => 'off',
                          );
     my %titles = &authordefaults_titles();
-    foreach my $item ('nocodemirror','daxecollapse','domcoordacc') {
+    foreach my $item ('nocodemirror','daxecollapse','domcoordacc','archive') {
         if ($env{'form.'.$item} =~ /^(0|1)$/) {
             $confhash{$item} = $env{'form.'.$item};
         }
@@ -13474,7 +13490,7 @@ sub modify_authordefaults {
         $save_quotas{'webdav'}{'_LC_adv'} = $env{'form.webdav_LC_adv'};
     }
     if (ref($domconfig{'authordefaults'}) eq 'HASH') {
-        foreach my $item ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail') {
+        foreach my $item ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail','archive') {
             if ($domconfig{'authordefaults'}{$item} ne $confhash{$item}) {
                 $changes{$item} = 1;
              }
@@ -13496,7 +13512,7 @@ sub modify_authordefaults {
         }
     } else {
         my @offon = ('off','on');
-        foreach my $item ('nocodemirror','daxecollapse','domcoordacc') {
+        foreach my $item ('nocodemirror','daxecollapse','domcoordacc','archive') {
             if ($offon[$confhash{$item}] ne $staticdefaults{$item}) {
                 $changes{$item} = 1; 
             }
@@ -13506,6 +13522,12 @@ sub modify_authordefaults {
                 $changes{$item} = 1;
             }
         }
+        my @diffs =
+            &Apache::loncommon::compare_arrays($confhash{'editors'},
+                                               $staticdefaults{'editors'});
+        unless (@diffs == 0) {
+            $changes{'editors'} = 1;
+        }
     }
     foreach my $key ('authorquota','webdav') {
         if (ref($curr_quotas{$key}) eq 'HASH') {
@@ -13587,7 +13609,7 @@ sub modify_authordefaults {
                 $resulttext .= '</ul></li>';
             }
             my $domcoordoverride;
-            foreach my $key ('editors','authorquota','webdav','webdav_LC_adv') {
+            foreach my $key ('editors','authorquota','webdav','webdav_LC_adv','archive') {
                 if (exists($changes{$key})) {
                     my $shown;
                     unless ($domcoordoverride) {
@@ -13619,6 +13641,9 @@ sub modify_authordefaults {
                         } else {
                             $shown = $titles{'none'};
                         }
+                    } elsif ($key eq 'archive') {
+                        $domdefaults{$key} = $confhash{$key};
+                        $shown = ($confhash{$key} ? &mt('Yes') : &mt('No'));
                     }
                     $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>';
                 }
@@ -13626,6 +13651,7 @@ sub modify_authordefaults {
             if ($domcoordoverride) {
                 $resulttext .= '</ul></li>';
             }
+            $resulttext .= '</ul>';
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
             if (ref($lastactref) eq 'HASH') {
@@ -13694,11 +13720,15 @@ sub modify_colors {
             @images = ('img','logo','domlogo','login');
             @bgs = ('pgbg','mainbg','sidebg');
         } else {
-            @images = ('img');
+            @images = ();
             @bgs = ('pgbg','tabbg','sidebg');
         }
         my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
-        unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) {
+        $env{'form.'.$role.'_font'} = lc($env{'form.'.$role.'_font'});
+        if ($env{'form.'.$role.'_font'} =~ /^\w+/) {
+            $env{'form.'.$role.'_font'} = '#'.$env{'form.'.$role.'_font'};
+        }
+        unless ($env{'form.'.$role.'_font'} eq lc($defaults{'font'})) {
             $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
         }
         if ($role eq 'login') {
@@ -13716,7 +13746,7 @@ sub modify_colors {
             if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
                 $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
             }
-            unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
+            unless ($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
                 $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
             }
         }
@@ -14829,6 +14859,7 @@ sub modify_quotas {
                             $resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]',
                                                      '<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>';
                         }
+                        $resulttext .= '</ul></li>';
                     }
                 }
             }
@@ -19859,21 +19890,27 @@ sub modify_usermodification {
             }
         }
     }
-    my @contexts = ('author','course');
+    my @contexts = ('author','coauthor','course');
     my %context_title = (
                            author => 'In author context',
+                           coauthor => 'As co-author manager',
                            course => 'In course context',
                         );
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
     my %roles = (
                   author => ['ca','aa'],
+                  coauthor => ['ca','aa'],
                   course => ['st','ep','ta','in','cr'],
                 );
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     foreach my $context (@contexts) {
+        my $prefix = 'canmodify';
+        if ($context eq 'coauthor') {
+            $prefix = 'cacanmodify';
+        }
         foreach my $role (@{$roles{$context}}) {
-            my @modifiable =  &Apache::loncommon::get_env_multiple('form.canmodify_'.$role);
+            my @modifiable =  &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$role);
             foreach my $item (@fields) {
                 if (grep(/^\Q$item\E$/,@modifiable)) {
                     $modifyhash{$context}{$role}{$item} = 1;