--- loncom/interface/londocs.pm	2023/09/27 14:52:26	1.705
+++ loncom/interface/londocs.pm	2024/01/10 20:07:37	1.709
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.705 2023/09/27 14:52:26 raeburn Exp $
+# $Id: londocs.pm,v 1.709 2024/01/10 20:07:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,6 +102,7 @@ sub authorhosts {
     my %outhash=();
     my $home=0;
     my $other=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $key (keys(%env)) {
 	if ($key=~/^user\.role\.(au|ca)\.(.+)$/) {
 	    my $role=$1;
@@ -118,7 +119,6 @@ sub authorhosts {
 	    }
 	    my $allowed=0;
 	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
-	    my @ids=&Apache::lonnet::current_machine_ids();
 	    foreach my $id (@ids) {
                 if ($id eq $myhome) {
                     $allowed=1;
@@ -263,8 +263,8 @@ ENDJS
                          add_entries => {'onload' => "hide_searching();"},
                      };
     }
-    $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n".
-              &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n");
+    $r->print(&Apache::loncommon::start_page('Copy uploaded content to Authoring Space',$js,$starthash)."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Copy uploaded content to Authoring Space')."\n");
     $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) {
@@ -5892,7 +5892,9 @@ sub handler {
 	               'Load_Map','Supplemental','Score_Upload_Form',
 	               'Adding_Pages','Importing_LON-CAPA_Resource',
 	               'Importing_IMS_Course','Uploading_From_Harddrive',
-                       'Course_Roster','Web_Page','Dropbox','Simple_Problem') {
+                       'Course_Roster','Web_Page','Dropbox','Simple_Problem',
+                       'Standard_Problem','Course_Resources',
+                       'Search_LON-CAPA_Resource','Import_Stored_Links') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -5963,7 +5965,7 @@ sub handler {
       &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions');
       &checkversions($r,$canedit);
   } elsif ($canedit && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
+      &init_breadcrumbs('dumpcourse','Copy uploaded content to Authoring Space');
       &dumpcourse($r);
   } elsif ($canedit && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -6147,8 +6149,8 @@ sub handler {
             &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom);
         }
     }
- 
-# If we are not allowed to make changes and this is supplemental content set folderpath  
+
+# Set folderpath if we are not allowed to make changes and this is supplemental content
     if ((!$allowed) && ($supplementalflag)) {
         unless ($env{'form.folderpath'} =~ /^supplemental/) {
             $env{'form.folderpath'} = &supplemental_base();
@@ -6501,7 +6503,7 @@ sub handler {
 
   if ($allowed && $toolsflag) {
       $r->print(&startContentScreen('tools'));
-      $r->print(&generate_admin_menu($crstype,$canedit));
+      $r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom));
       $r->print(&endContentScreen());
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
@@ -6509,8 +6511,8 @@ sub handler {
 		'copm' => 'All documents out of a published map into this folder',
                 'upfi' => 'Upload File',
                 'upld' => 'Upload Content',
-                'srch' => 'Search',
-                'impo' => 'Import',
+                'srch' => 'Search Repository',
+                'impo' => 'Import from Repository',
 		'lnks' => 'Import from Stored Links',
                 'impm' => 'Import from Assembled Map',
                 'imcr' => 'Import from Course Resources',
@@ -6687,13 +6689,22 @@ FUFORM
         </form>
 
 SEDFFORM
-        my $importcrsresform;
-        my ($numdirs,$pickfile) = 
-            &Apache::loncommon::import_crsauthor_form('coursepath','coursefile',
-                                                      "resize_scrollbox('contentscroll','1','0');",
-                                                      undef,'res');
-        if ($pickfile) {
-            $importcrsresform=(<<CRSFORM);
+        my ($importcrsresform,$checkcrsres);
+        if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) {
+            $checkcrsres = 1;
+        } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') {
+            my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom);
+            if ($domdefs{'crsauthor'}) {
+                $checkcrsres = 1;
+            }
+        }
+        if ($checkcrsres) {
+            my ($numdirs,$pickfile) = 
+                &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');">
         $lt{'imcr'}</a>$help{'Course_Resources'}
         <form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();">
@@ -6716,6 +6727,7 @@ SEDFFORM
         </fieldset>
         </form>
 CRSFORM
+            }
         }
 
         my $fromstoredjs;
@@ -6726,13 +6738,13 @@ CRSFORM
         }
 
 	my @importpubforma = (
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>$help{'Search_LON-CAPA_Resource'}" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>'.$help{'Import_Stored_Links'} },
         { '<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\');" />' => $importcrsresform});
+        if ($importcrsresform) {
+            push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/impcrsau.png" alt="'.$lt{imcr}.'"  onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform});
 	}
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
@@ -6984,13 +6996,14 @@ NWEBFORM
                 }
             }
         }
-        $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n".
-                    '</select><br />'."\n".
+        if ($checkcrsres) {
+            $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n";
+        }
+        $pickdir .= '</select><br />'."\n".
                     $lt{'dire'}.
                     '<select name="authorpath" onchange="toggleCrsResTitle();">'.
                     '<option value=""></option>'.
                     '</select><br />'."\n";
-
         my %seltemplate_menus;
         my @files = &Apache::lonhomework::get_template_list('problem');
         my @noexamplelink = ('blank.problem','blank.library','script.library');
@@ -7031,9 +7044,11 @@ NWEBFORM
                                                                 "toggleExampleText();",'template').'<br />';
         my $templatepreview =  '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true);  return false;">'.
                                '<span id="newresexample">'.&mt('Example').'</span></a>';
-        my $crsresform=(<<RESFORM);
+        my $crsresform;
+        if (($env{'user.author'}) || ($checkcrsres)) {
+            $crsresform=(<<RESFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res');">
-        $lt{'stpr'}</a>$help{'Course_Resource'}
+        $lt{'stpr'}</a>$help{'Standard_Problem'}
         <form action="/adm/coursedocs" method="post" name="courseresform">
         <fieldset id="crsresform" style="display:none;">
         <legend>$lt{'stpr'}</legend>
@@ -7087,6 +7102,7 @@ NWEBFORM
         </form>
 
 RESFORM
+        }
 
 my $specialdocumentsform;
 my @specialdocumentsforma;
@@ -7180,9 +7196,13 @@ NGFFORM
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
         );
+        if ($crsresform) {
+            push(@gradingforma,
+                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform}
+            );
+        }
         $gradingform = &create_form_ul(&create_list_elements(@gradingforma));
 
         @communityforma=(
@@ -7196,8 +7216,8 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Upload',$fileuploadform],
-                'bb' => ['Import',$importpubform],
-                'cc' => ['External',$externalform],
+                'bb' => ['External',$externalform],
+                'cc' => ['Import',$importpubform],
                 'dd' => ['Assessment',$gradingform],
                 'ff' => ['Other',$specialdocumentsform],
                 );
@@ -7577,7 +7597,7 @@ sub remove_archive {
 }
 
 sub generate_admin_menu {
-    my ($crstype,$canedit) = @_;
+    my ($crstype,$canedit,$coursenum,$coursedom) = @_;
     my $lc_crstype = lc($crstype);
     my ($home,$other,%outhash)=&authorhosts();
     my %lt= ( # do not translate here
@@ -7585,6 +7605,7 @@ sub generate_admin_menu {
                                          'cv'   => 'Check/Set Resource Versions',
                                          'ls'   => 'List Resource Identifiers',
                                          'ct'   => 'Display/Set Shortened URLs for Deep-linking',
+                                         'ca'   => "Enter $crstype Authoring Space",
                                          'imse' => 'Export contents to IMS Archive',
                                          'dcd'  => "Copy $crstype Content to Authoring Space",
             );
@@ -7645,6 +7666,31 @@ sub generate_admin_menu {
                 ]
         });
     if ($canedit) {
+        my ($crsauname,$crsaudom,$crshome);
+        if (($coursenum ne '') && ($coursedom ne '')) {
+            my $crsauthorurl = "/priv/$coursedom/$coursenum/";
+            ($crsauname,$crsaudom,$crshome) = &Apache::lonnet::constructaccess($crsauthorurl);
+            if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) {
+                my @ids=&Apache::lonnet::current_machine_ids();
+                my $linkurl;
+                if (grep(/^\Q$crshome\E$/,@ids)) {
+                    $linkurl = $crsauthorurl;
+                } else {
+                    $linkurl =
+                        &Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1);
+                }
+                if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY')) {
+                     push(@{$menu[0]->{items}},
+                     {   linktext   => $lt{'ca'},
+                         url        => $linkurl,
+                         permission => 'F',
+                         help       => 'Docs_Course_Authorspace',
+                         icon       => 'impcrsau.png',
+                         linktitle  => $lt{'ca'},
+                     });
+                }
+            }
+        }
         push(@menu,
         {   categorytitle=>'Export',
             items =>[
@@ -8182,6 +8228,13 @@ function toggleMap(caller) {
             }
         }
         document.getElementById('importmapform').style.display=disp;
+        if (disp == 'block') {
+            if (document.getElementById('importcrsresform')) {
+                if (document.getElementById('importcrsresform').style.display == 'block') {
+                    document.getElementById('importcrsresform').style.display = 'none';
+                }
+            }
+        }
         resize_scrollbox('contentscroll','1','1');
     }
     return;
@@ -8382,6 +8435,13 @@ function toggleImportCrsres(caller) {
             }
         }
         document.getElementById('importcrsresform').style.display=disp;
+        if (disp == 'block') {
+            if (document.getElementById('importmapform')) {
+                if (document.getElementById('importmapform').style.display == 'block') {
+                    document.getElementById('importmapform').style.display = 'none';
+                }
+            }
+        }
         resize_scrollbox('contentscroll','1','0');
     }
     return;
@@ -8433,6 +8493,7 @@ function populateDirSelects(form,locsel,
                 }
             }
         }
+        var templateradio = document.courseresform.elements['newresusetemp'];
         if (athome) {
             if (document.getElementById('stdprobswitch')) {
                 document.getElementById('stdprobswitch').style.display = 'none';
@@ -8440,6 +8501,16 @@ function populateDirSelects(form,locsel,
             if (document.getElementById('newstdproblem')) {
                 document.getElementById('newstdproblem').style.display = 'none';
             }
+            var canedit = '$canedit';
+            if (canedit) {
+                if (templateradio.length > 1) {
+                    for (var i=0; i<templateradio.length; i++) {
+                        templateradio[i].disabled = false;
+                    }
+                }
+                document.courseresform.newresourcename.disabled = false;
+                document.courseresform.newcrs.disabled = false;
+            }
             var http = new XMLHttpRequest();
             var url = "/adm/courseauthor";
             var params = "role="+role+"&rec="+recurse+"&nonempty="+nonemptydir+"&addtop=1";
@@ -8478,6 +8549,13 @@ function populateDirSelects(form,locsel,
             if (document.getElementById('newstdproblem')) {
                 document.getElementById('newstdproblem').style.display = 'none';
             }
+            if (templateradio.length > 1) {
+                for (var i=0; i<templateradio.length; i++) {
+                    templateradio[i].disabled = true;
+                }
+            }
+            document.courseresform.newresourcename.disabled = true;
+            document.courseresform.newcrs.disabled = true;
         }
     }
     return;
@@ -9329,7 +9407,7 @@ sub dump_switchserver_js {
     );
     my %html_js_lt = &Apache::lonlocal::texthash(
         swit => 'Switch server?',
-        duco => 'Copying Content to Authoring Space',
+        duco => 'Copying uploaded content to Authoring Space',
         yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
         chos => 'Choose server',
     );
@@ -9470,55 +9548,8 @@ sub makenewproblem {
                         if ($redirect) {
                             my $rightsfile = 'default.rights';
                             my $sourcerights = "$path/$rightsfile";
+                            &Apache::loncommon::crsauthor_rights($rightsfile,$path,$docroot,$coursenum,$coursedom);
                             my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile";
-                            my $now = time;
-                            if (!-e $sourcerights) {
-                                my $cid = $coursedom.'_'.$coursenum;
-                                if (open(my $fh,">$sourcerights")) {
-                                    print $fh <<END;
-<accessrule effect="deny" realm="" type="course" role="" />
-<accessrule effect="allow" realm="$cid" type="course" role="" />
-END
-                                    close($fh);
-                                }
-                            }
-                            if (!-e "$sourcerights.meta") {
-                                if (open(my $fh,">$sourcerights.meta")) {
-                                    my $author=$env{'environment.firstname'}.' '.
-                                               $env{'environment.middlename'}.' '.
-                                               $env{'environment.lastname'}.' '.
-                                               $env{'environment.generation'};
-                                    $author =~ s/\s+$//;
-                                    print $fh <<"END";
-
-<abstract></abstract>
-<author>$author</author>
-<authorspace>$coursenum:$coursedom</authorspace>
-<copyright>private</copyright>
-<creationdate>$now</creationdate>
-<customdistributionfile></customdistributionfile>
-<dependencies></dependencies>
-<domain>$coursedom</domain>
-<highestgradelevel>0</highestgradelevel>
-<keywords></keywords>
-<language>notset </language>
-<lastrevisiondate>$now</lastrevisiondate>
-<lowestgradelevel>0</lowestgradelevel>
-<mime>rights</mime>
-<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>
-<notes></notes>
-<obsolete></obsolete>
-<obsoletereplacement></obsoletereplacement>
-<owner>$coursenum:$coursedom</owner>
-<rule>deny:::course,allow:$cid::course</rule>
-<sourceavail></sourceavail>
-<standards></standards>
-<subject></subject>
-<title>Course Authoring Rights</title>
-END
-                                    close($fh);
-                                }
-                            }
                             if ((-e $sourcerights) && (-e "$sourcerights.meta")) {
                                 if (!-e "$docroot/res/$coursedom") {
                                     mkdir("$docroot/res/$coursedom",0755);