--- loncom/publisher/lonpubdir.pm	2023/06/11 20:45:40	1.178
+++ loncom/publisher/lonpubdir.pm	2023/07/14 18:01:23	1.180
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.178 2023/06/11 20:45:40 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.180 2023/07/14 18:01:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,7 @@ sub handler {
 
     # Validate access to the construction space and get username:domain.
 
-    my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); 
+    my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri);
     unless (($uname) && ($udom)) {
         return HTTP_NOT_ACCEPTABLE;
     }
@@ -105,7 +105,7 @@ sub handler {
     my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
                                                  $cstr,$crstype); # expressed in MB
     # Put out the start of page.
-    
+
     &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
 
     if (!-d $fn) {
@@ -128,12 +128,12 @@ sub handler {
     }
 
     # Put out actions for directory, browse/upload + new file page.
-    &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
+    &dircontrols($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota,$crsauthor);
     &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
 
     my $numdir = 0;
     my $numres = 0;
-  
+
     if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
         if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
             $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
@@ -192,7 +192,7 @@ sub handler {
                             order => 'ascending',
                             text  => &mt('Size').' (kB)',
                         },
-    ); 
+    );
 
     # Print column headers
     my $output = '';
@@ -237,18 +237,23 @@ my $result = "<script type=\"text/javasc
         my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
         my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
         # Identify type of file according to icon used
-        my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$}); 
+        my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$});
         my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn;
         my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename);
-        
+
         # Store size, title, and status for files but not directories
         my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0;
         my ($status, $pubstatus, $title, $fulltitle);
         if (!($cmode&$dirptr)) {
-            ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, 
+            ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir,
                 $filename, $linkfilename, $cmtime, $meta_same);
-            ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, 
-                                        $linkfilename, $meta_same, \%bombs);
+            if (($crsauthor) && ($extension eq 'rights')) {
+                $title = &getTitleString($targetdir.'/'.$filename);
+                $fulltitle = $title;
+            } else {
+                ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename,
+                                                 $linkfilename, $meta_same, \%bombs);
+            }
         } else {
             ($status, $pubstatus) = ('','');
             ($fulltitle, $title) = ('','');
@@ -267,7 +272,7 @@ my $result = "<script type=\"text/javasc
             "linkfilename"      => $linkfilename,
         }
     }
-   
+
     my @sorted_files;
     # Sorting by something other than "Name".  Name is the secondary key.
     if ($sortby =~ m{cmtime|size}) {    # Numeric fields
@@ -301,7 +306,7 @@ my $result = "<script type=\"text/javasc
         }
 
     # Sort by "Name" is the default
-    } else { 
+    } else {
         if ($sortorder eq "rev") {
             @sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash}));
         } else {
@@ -312,13 +317,14 @@ my $result = "<script type=\"text/javasc
     # Print the sorted resources
     foreach my $filename (@sorted_files) {
         if ($filehash->{$filename}->{"cmode"}&$dirptr) {        # Directories
-            &putdirectory($r, $thisdisfn, $linkdir, $filename, 
-                $filehash->{$filename}->{"cmtime"}, 
+            &putdirectory($r, $thisdisfn, $linkdir, $filename,
+                $filehash->{$filename}->{"cmtime"},
                 $targetdir, \%bombs, \$numdir);
         } else {                                                # Files
             &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
-                $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"}, 
-                $filehash->{$filename}->{"size"}, \$numres, 
+                $targetdir, $linkdir, $crsauthor,
+                $filehash->{$filename}->{"cmtime"},
+                $filehash->{$filename}->{"size"}, \$numres,
                 $filehash->{$filename}->{"linkfilename"},
                 $filehash->{$filename}->{"fulltitle"},
                 $filehash->{$filename}->{"status"},
@@ -342,13 +348,13 @@ my $result = "<script type=\"text/javasc
            .'</div>'
            .&Apache::loncommon::end_page()
   );
-  return OK;  
+  return OK;
 }
 
 
 
 #   Output the header of the page.  This includes:
-#   - The HTML header 
+#   - The HTML header
 #   - The H1/H3  stuff which includes the directory.
 #
 #     startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
@@ -381,22 +387,26 @@ sub startpage {
         'text'  => $title,
         'href'  => &Apache::loncommon::authorspace($formaction),
     });
-    # breadcrumbs (and tools) will be created 
+    # breadcrumbs (and tools) will be created
     # in start_page->bodytag->innerregister
 
     $env{'request.noversionuri'}=$formaction;
-    my $js = '<script type="text/javascript" 
+    my $js = '<script type="text/javascript"
                 src="/res/adm/includes/file_upload.js"></script>';
     $r->print(&Apache::loncommon::start_page($title, $js));
 
     $disk_quota = 1024 * $disk_quota; # convert from MB to kB
 
+    my $headertext = &mt('Directory');
+    if ($crsauthor) {
+        $headertext = &mt('Course Authoring Directory');
+    }
     $r->print(&Apache::loncommon::head_subbox(
                      '<div style="float:right;padding-top:0;margin-top;0">'
                     .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
                                                            $disk_quota,'authoring')
                     .'</div>'
-                    .&Apache::loncommon::CSTR_pageheader('','',&mt('Directory'))));
+                    .&Apache::loncommon::CSTR_pageheader('','',$headertext)));
 
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt($title);
@@ -413,9 +423,9 @@ parent.lastknownpriv='/priv$esc_thisdisf
     function checkUpload(theform) {
         if (theform.file == '') {
             alert("Please use 'Browse..' to choose a file first, before uploading")
-            return 
+            return
         }
-        theform.submit()  
+        theform.submit()
     }
 
     function SetPubDir(theform,printForm) {
@@ -493,7 +503,7 @@ ENDPUBDIRSCRIPT
 }
 
 sub dircontrols {
-    my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
+    my ($r,$uname,$udom,$thisdisfn,$current_disk_usage,$disk_quota,$crsauthor) = @_;
     my %lt=&Apache::lonlocal::texthash(
                                        cnpd => 'Cannot publish directory',
                                        cnrd => 'Cannot retrieve directory',
@@ -501,7 +511,7 @@ sub dircontrols {
                                        pubr => 'Publish this Resource',
                                        rtrv => 'Retrieve Old Version',
                                        list => 'List Directory',
-                                       uplo => 'Upload file',  
+                                       uplo => 'Upload file',
                                        dele => 'Delete',
                                        sela => 'Select Action',
                                        nfil => 'New file',
@@ -531,7 +541,7 @@ sub dircontrols {
                                        nanf => 'Name of New File',
                                        nans => 'Name of New Subdirectory',
                                        psfn => 'Please specify file name',
-    ); 
+    );
     &js_escape(\%js_lt);
     my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
     # Calculate free space in bytes.
@@ -552,6 +562,32 @@ sub dircontrols {
         </fieldset>
   </div>
 END
+    my %fileoptions = (
+                         none => "$lt{'sela'}:",
+                         newfile => "$lt{'nfil'}:",
+                         newhtmlfile => "$lt{'nhtm'}:",
+                         newproblemfile => "$lt{'nprb'}:",
+                         newdir => "$lt{'nsub'}:",
+                      );
+    $fileoptions{'select_form_order'} = ['none','newfile','newhtmlfile','newproblemfile'];
+    if ($crsauthor) {
+        push(@{$fileoptions{'select_form_order'}},'newdir');
+    } else {
+        my %extraoptions = (
+                              newpagefile => "$lt{'npag'}:",
+                              newsequencefile => "$lt{'nseq'}:",
+                              newrightsfile => "$lt{'ncrf'}:",
+                              newstyfile => "$lt{'nsty'}:",
+                              newtaskfile => "$lt{'nbt'}:",
+                              newlibraryfile => "$lt{'nlib'}:",
+        );
+        %fileoptions = (%fileoptions,%extraoptions);
+        push(@{$fileoptions{'select_form_order'}},('newpagefile','newsequencefile',
+                                                   'newrightsfile','newstyfile',
+                                                   'newtaskfile','newlibraryfile',
+                                                   'newdir'));
+    }
+    my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions);
     $r->print(<<END);
   <div style="padding-bottom: 2px">
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
@@ -581,19 +617,7 @@ END
                         }
                     }
                   </script>
-		  <select name="action">
-		    <option value="none">$lt{'sela'}</option>
-		    <option value="newfile">$lt{'nfil'}:</option>
-		    <option value="newhtmlfile">$lt{'nhtm'}:</option>
-		    <option value="newproblemfile">$lt{'nprb'}:</option>
-                    <option value="newpagefile">$lt{'npag'}:</option>
-                    <option value="newsequencefile">$lt{'nseq'}:</option>
-                    <option value="newrightsfile">$lt{'ncrf'}:</option>
-                    <option value="newstyfile">$lt{'nsty'}:</option>
-                    <option value="newtaskfile">$lt{'nbt'}:</option>
-                    <option value="newlibraryfile">$lt{'nlib'}:</option>
-	            <option value="newdir">$lt{'nsub'}:</option>
-		  </select>&nbsp;<input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
+		  $selectbox&nbsp;<input type="text" id="newnameid" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
 		<br />
                 <span>$lt{'shcu'}:
                  <input type="hidden" name="mode"/>
@@ -722,9 +746,9 @@ sub putdirectory {
     my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_;
 
 # construct the display filename: the directory name unless ..:
-   
+
     my $actionitem;
- 
+
     my $disfilename = $dirname;
 # Don't display directory itself, and there is no way up from root directory
     unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {
@@ -747,7 +771,7 @@ sub putdirectory {
             $actionitem = &mt('Go to ...');
             $disfilename = '<i>'.&mt('Parent Directory').'</i>';
         } else {
-            $actionitem = 
+            $actionitem =
                     '<form name="dirselect_'.$$numdir.
                     '" action="/adm/publish">'.
                     '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
@@ -801,7 +825,7 @@ sub getTitle {
                 &Apache::loncommon::modal_link(
                     '/adm/retrieve?filename='.$linkfilename.'.meta&amp;inhibitmenu=yes&amp;add_modal=yes',
                     &mt('Retrieve Metadata'),600,500);
-        } 
+        }
     }
     # Allow editing metadata of published and unpublished resources
     $title .= "\n".'<br />' if ($title);
@@ -820,14 +844,13 @@ sub isMetaSame {
     my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
     my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
     return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
-            $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime) 
+            $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime)
         ? 0 : 1;
 }
-    
 
-sub getStatus {    
-    my ($resdir, $targetdir, $cstr_dir, $filename,  
-            $linkfilename, $cmtime, $meta_same) = @_;
+sub getStatus {
+    my ($resdir, $targetdir, $cstr_dir, $filename,
+        $linkfilename, $crsauthor, $cmtime, $meta_same) = @_;
     my $pubstatus = 'unpublished';
     my $status = &mt('Unpublished');
 
@@ -853,7 +876,9 @@ sub getStatus {
         );
         $rights_status .=
             $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
-
+        if (($crsauthor) && ($filename =~ /\.rights$/)) {
+            $rights_status =~ s/,\s+$//;
+        }
 	if ($same) {
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';
@@ -871,17 +896,21 @@ sub getStatus {
             $pubstatus = 'modified';
 	    $status=&mt('Modified').
 		'<br />'. $rights_status;
-	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
-		$status.='<br />'.
-                         &Apache::loncommon::modal_link(
-                             '/adm/diff?filename='.$linkfilename.'&amp;versiontwo=priv',
-                             &mt('Diffs'),600,500);
+            unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+	        if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+		    $status.='<br />'.
+                             &Apache::loncommon::modal_link(
+                                 '/adm/diff?filename='.$linkfilename.'&amp;versiontwo=priv',
+                                 &mt('Diffs'),600,500);
+	        }
 	    }
-	} 
+	}
 
-	$status.="\n".'<br />'.
-             &Apache::loncommon::modal_link(
-                 '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
+        unless (($crsauthor) && ($filename =~ /\.rights$/)) {
+	    $status.="\n".'<br />'.
+                 &Apache::loncommon::modal_link(
+                     '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
+        }
     }
 
     return ($status, $pubstatus);
@@ -892,9 +921,9 @@ sub getStatus {
 #   Put a table row for a file resource.
 #
 sub putresource {
-    my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, 
-            $linkdir, $cmtime, $size, $numres, $linkfilename, $title, 
-            $status, $pubstatus) = @_;
+    my ($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+        $targetdir, $linkdir, $crsauthor, $cmtime, $size,
+        $numres, $linkfilename, $title, $status, $pubstatus) = @_;
     &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
 
     my $editlink='';
@@ -920,7 +949,9 @@ sub putresource {
     }
     my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
     my $pub_select = '';
-    &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+    unless (($crsauthor) && ($filename=~ /\.rights$/)) {
+        &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+    }
     $r->print(&Apache::loncommon::start_data_table_row().
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
 		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
@@ -947,7 +978,7 @@ sub create_pubselect {
 <option>'.&mt('Select action').'</option>'.
 '<option value="copy">'.&mt('Copy').'</option>';
     if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
-        $$pub_select .= 
+        $$pub_select .=
 '<option value="rename">'.&mt('Rename').'</option>'.
 '<option value="move">'.&mt('Move').'</option>'.
 '<option value="delete">'.&mt('Delete').'</option>';
@@ -986,7 +1017,7 @@ sub check_for_versions {
     opendir(DIR,$resdir);
     while (my $filename=readdir(DIR)) {
         if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
-            $versions ++;        
+            $versions ++;
         }
     }
     closedir(DIR);
@@ -994,7 +1025,7 @@ sub check_for_versions {
 }
 
 sub prepareJsonTranslations {
-    my $json = 
+    my $json =
         '{"translations":{'.
             '"edit":"'.&mt('Edit').'",'.
             '"editxml":"'.&mt('EditXML').'",'.
@@ -1065,7 +1096,7 @@ sub prepareJsonData_rec {
     closedir(DIR);
     # nothing to do here if both lists are empty
     return unless ( @dirs || @resources );
-    
+
 # Phase 2: Working
     $$firstfile = 1;
 
@@ -1187,9 +1218,9 @@ run through list of files and attempt to
 =item startpage($r, $uame, $udom, $thisdisfn)
 
 Output the header of the page.  This includes:
- - The HTML header 
+ - The HTML header
  - The H1/H3  stuff which includes the directory.
- 
+
     startpage($r, $uame, $udom, $thisdisfn);
         $r     - The apache request object.
         $uname - User name.
@@ -1202,7 +1233,7 @@ Output the header of the page.  This inc
     Without the latter substitution, it's impossible to examine metadata for
     untitled resources.  Resources may be legitimately untitled, to prevent
     searches from locating them.
-    
+
     $str = getTitleString($fullname);
         $fullname - Fully qualified filename to check.
 
@@ -1210,7 +1241,7 @@ Output the header of the page.  This inc
                    $numdir)
 
     Put out a directory table row:
-    
+
         $r        - Apache request object.
         $reqfile  - File in request.
         $here     - Where we are in directory tree.