--- loncom/interface/loncreateuser.pm	2023/11/05 20:06:04	1.473
+++ loncom/interface/loncreateuser.pm	2024/05/01 21:23:20	1.479
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.473 2023/11/05 20:06:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.479 2024/05/01 21:23:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -245,10 +245,15 @@ function toggleCustom(form,item,name) {
         if (radioname) {
             if (radioname.length > 0) {
                 var setvis;
+                var RegExp = /^customtext_(aboutme|blog|portfolio|portaccess|timezone|webdav|archive)\$/;
                 for (var i=0; i<radioname.length; i++) {
                     if (radioname[i].checked == true) {
                         if (radioname[i].value == 1) {
-                            divid.style.display = 'block';
+                            if (RegExp.test(item)) {
+                                divid.style.display = 'inline';
+                            } else {
+                                divid.style.display = 'block';
+                            }
                             setvis = 1;
                         }
                         break;
@@ -273,13 +278,14 @@ sub build_tools_display {
     my ($ccuname,$ccdomain,$context) = @_;
     my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
         $colspan,$isadv,%domconfig,@defaulteditors,@customeditors,@custommanagers,
-        @possmanagers,$editorsty,$customsty);
+        @possmanagers);
     my %lt = &Apache::lonlocal::texthash (
                    'blog'       => "Personal User Blog",
                    'aboutme'    => "Personal Information Page",
                    'webdav'     => "WebDAV access to Authoring Spaces (https)",
                    'editors'    => "Available Editors",
                    'managers'   => "Co-authors who can add/revoke roles",
+                   'archive'    => "Managers can download tar.gz file of Authoring Space",
                    'portfolio'  => "Personal User Portfolio",
                    'portaccess' => "Portfolio Shareable",
                    'timezone'   => "Can set Time Zone",
@@ -325,8 +331,8 @@ sub build_tools_display {
             &Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain);
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav',
                                                     'authoreditors','authormanagers',
-                                                    'domcoord.author');
-        @usertools = ('webdav','editors','managers');
+                                                    'authorarchive','domcoord.author');
+        @usertools = ('webdav','editors','managers','archive');
         $colspan = ' colspan="2"';
     } else {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
@@ -337,23 +343,33 @@ sub build_tools_display {
     }
     foreach my $item (@usertools) {
         my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
-            $currdisp,$custdisp,$custradio,$onclick);
+            $currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty);
         $cust_off = 'checked="checked" ';
         $tool_on = 'checked="checked" ';
-        $curr_access =
-            &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
-                                              $context,\%userenv,'',
-                                              {'is_adv' => $isadv});
+        unless (($context eq 'authordefaults') || ($item eq 'webdav')) {
+            $curr_access =
+                &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
+                                                  $context,\%userenv,'',
+                                                  {'is_adv' => $isadv});
+        }
         if ($context eq 'requestauthor') {
             if ($userenv{$context} ne '') {
                 $cust_on = ' checked="checked" ';
                 $cust_off = '';
             }
         } elsif ($context eq 'authordefaults') {
-            if ($item eq 'editors') {
+            if (($item eq 'editors') || ($item eq 'archive')) {
                 if ($userenv{'author'.$item} ne '') {
                     $cust_on = ' checked="checked" ';
                     $cust_off = '';
+                    if ($item eq 'archive') {
+                        $curr_access = $userenv{'author'.$item};
+                    }
+                } elsif ($item eq 'archive') {
+                    $curr_access = 0;
+                    if (ref($domconfig{'authordefaults'}) eq 'HASH') {
+                        $curr_access = $domconfig{'authordefaults'}{'archive'};
+                    }
                 }
             } elsif ($item eq 'webdav') {
                 if ($userenv{'tools.'.$item} ne '') {
@@ -450,6 +466,8 @@ sub build_tools_display {
             my $current = $userenv{$context.'.'.$item};
             if ($item eq 'webdav') {
                 $current = $userenv{'tools.webdav'};
+            } elsif ($item eq 'archive') {
+                $current = $userenv{'author'.$item};
             }
             if ($current eq '') {
                 $custom_access =
@@ -474,16 +492,14 @@ sub build_tools_display {
                    '  </tr>'."\n".
                    &Apache::loncommon::start_data_table_row()."\n";
         if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
-            my ($curroption,$currlimit,$customsty);
+            my ($curroption,$currlimit);
             my $envkey = $context.'.'.$item;
             if ($context eq 'requestauthor') {
                 $envkey = $context;
             }
             if ($userenv{$envkey} ne '') {
                 $curroption = $userenv{$envkey};
-                $customsty = ' style="display:block"';
             } else {
-                $customsty = ' style="display:none"';
                 my (@inststatuses);
                 if ($context eq 'requestcourses') {
                     $curroption =
@@ -1518,7 +1534,7 @@ sub print_user_modification_page {
             unless ($isauthor) {
                 push(@toggles,'requestauthor');
             }
-            push(@toggles,('webdav','editors'));
+            push(@toggles,('webdav','editors','archive'));
         }
         if (&Apache::lonnet::allowed('mut',$ccdomain)) {
             push(@toggles,('aboutme','blog','portfolio','portaccess','timezone'));
@@ -3230,7 +3246,7 @@ sub update_user_data {
     my @usertools = ('aboutme','blog','portfolio','portaccess','timezone');
     my @requestcourses = ('official','unofficial','community','textbook','placement','lti');
     my @requestauthor = ('requestauthor');
-    my @authordefaults = ('webdav','editors');
+    my @authordefaults = ('webdav','editors','archive');
     my ($othertitle,$usertypes,$types) = 
         &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
     my %canmodify_status =
@@ -3360,7 +3376,13 @@ sub update_user_data {
                 if ($env{'form.customwebdav'} == 1) {
                     $newcustom{'webdav'} = $env{'form.authordefaults_webdav'};
                     $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'},
-                                                  \%changeHash,'authordefaults');
+                                                     \%changeHash,'authordefaults');
+                }
+                if ($env{'for.customarchive'} == 1) {
+                    $newcustom{'archive'} = $env{'form.authordefaults_archive'};
+                    $changed{'archive'} = &tool_admin('archive',$newcustom{'archive'},
+                                                      \%changeHash,'authordefaults');
+
                 }
             }
             if ($canmodify_status{'inststatus'}) {
@@ -3429,7 +3451,7 @@ sub update_user_data {
              'id','permanentemail','portfolioquota','authorquota','inststatus',
              'tools.aboutme','tools.blog','tools.webdav',
              'tools.portfolio','tools.timezone','tools.portaccess',
-             'authormanagers','authoreditors','requestauthor',
+             'authormanagers','authoreditors','authorarchive','requestauthor',
              'requestcourses.official','requestcourses.unofficial',
              'requestcourses.community','requestcourses.textbook',
              'requestcourses.placement','requestcourses.lti',
@@ -3781,7 +3803,10 @@ sub update_user_data {
                     }
                     if (($env{'user.name'} eq $env{'form.ccuname'}) &&
                         ($env{'user.domain'} eq $env{'form.ccdomain'})) {
-                        my %newenvhash;
+                        my (%newenvhash,$got_domdefs,%domdefaults,$got_userenv,
+                            %userenv);
+                        my @fromenv = keys(%changed);
+                        push(@fromenv,'inststatus');
                         foreach my $key (keys(%changed)) {
                             if (($key eq 'official') || ($key eq 'unofficial') ||
                                 ($key eq 'community') || ($key eq 'textbook') ||
@@ -3791,28 +3816,55 @@ sub update_user_data {
                                 if ($changeHash{'requestcourses.'.$key}) {
                                     $newenvhash{'environment.canrequest.'.$key} = 1;
                                 } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                            &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    unless ($got_userenv) {
+                                        %userenv =
+                                            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                             $env{'user.name'},@fromenv);
+                                        $got_userenv = 1;
+                                    }
                                     $newenvhash{'environment.canrequest.'.$key} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-                                            $key,'reload','requestcourses');
+                                            $key,'reload','requestcourses',\%userenv,\%domdefaults);
                                 }
                             } elsif ($key eq 'requestauthor') {
                                 $newenvhash{'environment.'.$key} = $changeHash{$key};
                                 if ($changeHash{$key}) {
                                     $newenvhash{'environment.canrequest.author'} = 1;
                                 } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                           &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    unless ($got_userenv) {
+                                        %userenv =
+                                            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                             $env{'user.name'},@fromenv);
+                                        $got_userenv = 1;
+                                    }
                                     $newenvhash{'environment.canrequest.author'} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-                                            $key,'reload','requestauthor');
+                                            $key,'reload','requestauthor',\%userenv,\%domdefaults);
                                 }
                             } elsif ($key eq 'editors') {
                                 $newenvhash{'environment.author'.$key} = $changeHash{'author'.$key};
-                                if ($key eq 'editors') {
-                                    if ($env{'form.customeditors'}) {
-                                        $newenvhash{'environment.editors'} = $changeHash{'author'.$key};
+                                if ($env{'form.customeditors'}) {
+                                    $newenvhash{'environment.editors'} = $changeHash{'author'.$key};
+                                } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                            &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    if ($domdefaults{'editors'} ne '') {
+                                        $newenvhash{'environment.editors'} = $domdefaults{'editors'};
                                     } else {
-                                        $newenvhash{'environment.editors'} =
-          &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-                                            $key,'reload','authordefaults');
+                                        $newenvhash{'environment.editors'} = 'edit,xml';
                                     }
                                 }
                             } elsif ($key ne 'quota') {
@@ -3822,9 +3874,20 @@ sub update_user_data {
                                     $newenvhash{'environment.availabletools.'.$key} =
                                         $changeHash{'tools.'.$key};
                                 } else {
+                                    unless ($got_domdefs) {
+                                        %domdefaults =
+                                           &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                        $got_domdefs = 1;
+                                    }
+                                    unless ($got_userenv) {
+                                        %userenv =
+                                            &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                             $env{'user.name'},@fromenv);
+                                        $got_userenv = 1;
+                                    }
                                     $newenvhash{'environment.availabletools.'.$key} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
-                                            $key,'reload','tools');
+                                            $key,'reload','tools',\%userenv,\%domdefaults);
                                 }
                             }
                         }
@@ -4026,6 +4089,7 @@ sub display_userinfo {
          'chto'           => 'Changed To:',
          'editors'        => "Available Editors in Authoring Space",
          'managers'       => "Co-authors who can add/revoke roles",
+         'archive'        => "Managers can download tar.gz file of Authoring Space",
          'edit'           => 'Standard editor (Edit)',
          'xml'            => 'Text editor (EditXML)',
          'daxe'           => 'Daxe editor (Daxe)',
@@ -4059,7 +4123,7 @@ sub display_userinfo {
                     if ($entry eq 'requestauthor') {
                         @items = ($entry);
                     } elsif ($entry eq 'authordefaults') {
-                        @items = ('webdav','managers','editors');
+                        @items = ('webdav','managers','editors','archive');
                     } else {
                         @items = @{$requestcourses};
                     }
@@ -4310,6 +4374,9 @@ sub tool_changes {
             } elsif ($tool eq 'webdav') {
                 $envkey = 'tools.webdav';
                 $newval = $env{'form.'.$context.'_'.$tool};
+            } elsif ($tool eq 'archive') {
+                $envkey = 'authorarchive';
+                $newval = $env{'form.'.$context.'_'.$tool};
             }
         } else {
             $newval = $env{'form.'.$context.'_'.$tool};
@@ -4341,7 +4408,7 @@ sub tool_changes {
                 } elsif ($tool eq 'editors') {
                     $oldaccesstext->{$tool} = &mt('can use: [_1]',
                                                   join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
-                } elsif ($tool eq 'webdav') {
+                } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
                     if ($userenv->{$envkey}) {
                         $oldaccesstext->{$tool} = &mt("availability set to 'on'");
                     } else {
@@ -4387,7 +4454,7 @@ sub tool_changes {
                                     $managers =~ s/,/, /g;
                                     $newaccesstext->{$tool} = $managers;
                                 }
-                            } elsif ($tool eq 'webdav') {
+                            } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
                                 if ($newval) {
                                     $newaccesstext->{$tool} = &mt("availability set to 'on'");
                                 } else {
@@ -4427,7 +4494,7 @@ sub tool_changes {
                                     $managers =~ s/,/, /g;
                                     $newaccesstext->{$tool} = $managers;
                                 }
-                            } elsif ($tool eq 'webdav') {
+                            } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
                                 if ($userenv->{$envkey}) {
                                     $newaccesstext->{$tool} = &mt("availability set to 'on'");
                                 } else {
@@ -4476,7 +4543,7 @@ sub tool_changes {
                                 $managers =~ s/,/, /g;
                                 $newaccesstext->{$tool} = $managers;
                             }
-                        } elsif ($tool eq 'webdav') {
+                        } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
                             if ($userenv->{$envkey}) {
                                 $newaccesstext->{$tool} = &mt("availability set to 'on'");
                             } else {
@@ -4524,7 +4591,7 @@ sub tool_changes {
                         } elsif ($tool eq 'editors') {
                             $newaccesstext->{$tool} = &mt('can use: [_1]',
                                                           join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
-                        } elsif ($tool eq 'webdav') {
+                        } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
                             if ($newval) {
                                 $newaccesstext->{$tool} = &mt("availability set to 'on'");
                             } else {
@@ -5188,7 +5255,7 @@ sub tool_admin {
             $toolchanged = 1;
             if ($tool eq 'requestauthor') {
                 $changeHash->{$context} = $settool;
-            } elsif (($tool eq 'managers') || ($tool eq 'editors')) {
+            } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) {
                 $changeHash->{'author'.$tool} = $settool;
             } elsif ($tool eq 'webdav') {
                 $changeHash->{'tools.'.$tool} = $settool;