--- loncom/interface/londocs.pm	2022/12/17 18:07:47	1.689
+++ loncom/interface/londocs.pm	2022/12/31 14:08:59	1.690
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.689 2022/12/17 18:07:47 raeburn Exp $
+# $Id: londocs.pm,v 1.690 2022/12/31 14:08:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6294,12 +6294,12 @@ FUFORM
 SEDFFORM
         my $importcrsresform;
         my ($numdirs,$pickfile) = 
-            &Apache::loncommon::import_crsauthor_form('crsresimportform','coursepath','coursefile',
+            &Apache::loncommon::import_crsauthor_form('coursepath','coursefile',
                                                       "resize_scrollbox('contentscroll','1','0');",
                                                       undef,'res');
         if ($pickfile) {
             $importcrsresform=(<<CRSFORM);
-        <a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res','$numdirs');">
+        <a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res');">
         $lt{'imcr'}</a>$help{'Course_Resources'}
         <form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();">
         <fieldset id="importcrsresform" style="display: none;">
@@ -6310,7 +6310,7 @@ SEDFFORM
         $lt{'title'}: <input type="textbox" name="crsrestitle" value="" $disabled />
         </p>
         <input type="hidden" name="importdetail" value="" />
-        <input type="submit" name="crsres" value="$lt{'impo'}" $disabled />
+        <input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br />
         </fieldset>
         </form>
 CRSFORM
@@ -6330,7 +6330,7 @@ CRSFORM
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform },
         );
         if ($pickfile) {
-            push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{imcr}.'"  onclick="javascript:toggleImportCrsres(\'res\','."'$numdirs'".');"/>' => $importcrsresform});
+            push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{imcr}.'"  onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform});
 	}
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
@@ -6537,16 +6537,16 @@ NWEBFORM
         my $numcrsdirs = 0;
         my ($showstdprob,$showswitch,$switchlink);
         my $toppath = "/priv/$env{'user.domain'}/$env{'user.name'}"; 
+        my $exclude = &Apache::lonnet::priv_exclude();
         if ($env{'user.author'}) {
             $numauthor ++;
             $select_menus{'author'}->{'text'} = &Apache::lonnet::plaintext('au');
             if (grep(/^\Q$env{'user.home'}\E$/,@ids)) {
                 my $is_home = 1;
                 my %subdirs;
-                &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+                &Apache::lonnet::recursedirs($is_home,1,'',$exclude,0,$toppath,'',\%subdirs);
                 $select_menus{'author'}->{'default'} = '/'; 
-                $select_menus{'author'}->{'select2'}->{'/'} = '/';
-                my @ordered = ('/');
+                my @ordered = ();
                 foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
                     $select_menus{'author'}->{'select2'}->{$relpath} = $relpath;
                     push(@ordered,$relpath);
@@ -6578,10 +6578,8 @@ NWEBFORM
                     my $is_home = 1;
                     my (%subdirs,@ordered);
                     my $toppath="/priv/$audom/$auname";
-                    &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+                    &Apache::lonnet::recursedirs($is_home,1,'',$exclude,0,$toppath,'',\%subdirs);
                     $select_menus{$key}->{'default'} = '/';
-                    $select_menus{$key}->{'select2'}->{'/'} = '/';
-                    my @ordered = ('/');
                     foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
                         $select_menus{$key}->{'select2'}->{$relpath} = $relpath;
                         push(@ordered,$relpath);
@@ -6626,11 +6624,10 @@ NWEBFORM
                 my $is_home = 1;
                 my %subdirs;
                 my $toppath="/priv/$coursedom/$coursenum";
-                &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+                &Apache::lonnet::recursedirs($is_home,1,'',$exclude,0,$toppath,'',\%subdirs);
                 $numcrsdirs = keys(%subdirs);
                 $select_menus{'course'}->{'default'} = '/';
-                $select_menus{'course'}->{'select2'}->{'/'} = '/';
-                my @ordered = ('/');
+                my @ordered = ();
                 foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
                     $select_menus{'course'}->{'select2'}->{$relpath} = $relpath;
                     push(@ordered,$relpath);
@@ -6658,7 +6655,7 @@ NWEBFORM
                 $pickdir .= '<input type="hidden" name="authorrole" value="course" />'; 
                 my $toppath="/priv/$coursedom/$coursenum'}";
                 my %subdirs;
-                &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+                &Apache::lonnet::recursedirs($is_home,1,'',$exclude,0,$toppath,'',\%subdirs);
                 $numcrsdirs = keys(%subdirs); 
                 if ($numcrsdirs) {
                     $pickdir .= $lt{'dire'}.' <select name="authorpath">'."\n".
@@ -6679,7 +6676,7 @@ NWEBFORM
                 $select_menus{'course'}->{'default'} = 'switch';
                 $select_menus{'course'}->{'order'} = ['switch'];
                 push(@order,'course');
-                my $defrole;
+                my $defrole = 'course';
                 $pickdir = $lt{'loca'}.
                            &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'dire'},
                                                                    $defrole,'authorrole','authorpath',
@@ -7530,7 +7527,7 @@ sub editing_js {
     my $backtourl;
     my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref));
     my $toplevelsupp = &supplemental_base();
-
+    my $showfile_js = &Apache::loncommon::show_crsfiles_js();
     if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) {
         my $caller = $1;
         if ($caller =~ /^supplemental/) {
@@ -8056,17 +8053,14 @@ function getExample(width,height,scrolli
     }
 }
 
-function toggleImportCrsres(caller,dircount) {
+function toggleImportCrsres(caller) {
     var disp = 'none';
     if (document.getElementById('importcrsresform')) {
         if (caller == 'res') {
-            var numdirs = parseInt(dircount);
             var curr = document.getElementById('importcrsresform').style.display;
             if (curr == 'none') {
                 disp='block';
-                if (numdirs > 1) {
-                    select1res_changed();
-                }
+                populateCrsSelects(document.crsresimportform,'coursepath','coursefile',1,'',1,0,1,1);
             }
         }
         document.getElementById('importcrsresform').style.display=disp;
@@ -8075,6 +8069,8 @@ function toggleImportCrsres(caller,dirco
     return;
 }
 
+$showfile_js
+
 function switchForProb() {
     if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') {
         var url = '/adm/switchserver?otherserver=';