--- loncom/publisher/lonpubdir.pm	2019/08/13 17:01:24	1.160.2.4
+++ loncom/publisher/lonpubdir.pm	2024/02/28 04:58:02	1.160.2.5.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.160.2.4 2019/08/13 17:01:24 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.160.2.5.2.3 2024/02/28 04:58:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,10 +91,10 @@ sub handler {
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,
                                 "$londocroot/priv/$udom/$uname"); # expressed in kB
     my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
-                                                 $cstr,$crstype); # expressed in MB
+                                                 'author'); # expressed in MB
 
     # Put out the start of page.
-    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor);
+    &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
 
     if (!-d $fn) {
         if (-e $fn) {
@@ -290,6 +290,7 @@ sub handler {
     }
 
     # Print the sorted resources
+    my %editors = &Apache::loncommon::permitted_editors();
     foreach my $filename (@sorted_files) {
         if ($filehash->{$filename}->{"cmode"}&$dirptr) {        # Directories
             &putdirectory($r, $thisdisfn, $linkdir, $filename, 
@@ -302,7 +303,8 @@ sub handler {
                 $filehash->{$filename}->{"linkfilename"},
                 $filehash->{$filename}->{"fulltitle"},
                 $filehash->{$filename}->{"status"},
-                $filehash->{$filename}->{"pubstatus"});
+                $filehash->{$filename}->{"pubstatus"},
+                \%editors);
         }
     }
 
@@ -528,17 +530,17 @@ sub dircontrols {
         <input type="hidden" name="filename" value="/priv$thisdisfn/" />
       </fieldset>
     </form>
-    <form name="publishdir" method="post" action="/adm/publish" target="_parent">
+    <form name="publishdir" method="post" action="/adm/publish">
       <input type="hidden" name="pubrec" value="" />
       <input type="hidden" name="filename" value="" />
     </form>
-    <form name="printdir" method="post" action="/adm/printout" target="_parent">
+    <form name="printdir" method="post" action="/adm/printout">
       <input type="hidden" name="postdata" value="" />
     </form>
   </div>
 
   <div style="padding-bottom: 2px">
-    <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+    <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload">
       <fieldset>
         <legend>$lt{'updc'}</legend>
         <input type="hidden" name="filename" value="/priv$thisdisfn/" />
@@ -550,7 +552,7 @@ sub dircontrols {
   </div>
 
   <div>
-    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
+    <form name="fileaction" method="post" action="/adm/cfile">
       <fieldset>
               <legend>$lt{'crea'}</legend>
 	      <span class="LC_nobreak">
@@ -626,26 +628,26 @@ END
 sub resourceactions {
     my ($r,$uname,$udom,$thisdisfn) = @_;
     $r->print(<<END);
-       <form name="moveresource" action="/adm/cfile" target="_parent" method="post">
+       <form name="moveresource" action="/adm/cfile" method="post">
          <input type="hidden" name="filename" value="" />
          <input type="hidden" name="newfilename" value="" />
          <input type="hidden" name="action" value="" />
        </form>
-       <form name="delresource" action="/adm/cfile" target="_parent" method="post">
+       <form name="delresource" action="/adm/cfile" method="post">
          <input type="hidden" name="filename" value="" />
          <input type="hidden" name="action" value="delete" />
        </form>
-       <form name="pubresource" action="/adm/publish" target="_parent" method="post">
+       <form name="pubresource" action="/adm/publish" method="post">
          <input type="hidden" name="filename" value="" />
          <input type="hidden" name="makeobsolete" value="0" />
        </form>
-       <form name="printresource" action="/adm/printout" target="_parent" method="post">
+       <form name="printresource" action="/adm/printout" method="post">
            <input type="hidden" name="postdata" value="" />
        </form>
-       <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
+       <form name="retrieveres" action="/adm/retrieve" method="post">
            <input type="hidden" name="filename" value="" />
        </form>
-       <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
+       <form name="cleanup" action="/adm/cleanup" method="post">
            <input type="hidden" name="filename" value="" />
        </form>
 END
@@ -723,7 +725,7 @@ sub putdirectory {
         } else {
             $actionitem = 
                     '<form name="dirselect_'.$$numdir.
-                    '" action="/adm/publish" target="_parent">'.
+                    '" action="/adm/publish">'.
                     '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
                       '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.
@@ -742,7 +744,7 @@ sub putdirectory {
 		  '<td><img src="'.
 		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.
 		  '<td>'.$actionitem.'</td>'.
-		  '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
+		  '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'.
 		  $disfilename.'</a></span></td>'.
 		        '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
 	if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
@@ -868,23 +870,34 @@ sub getStatus {
 sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, 
             $linkdir, $cmtime, $size, $numres, $linkfilename, $title, 
-            $status, $pubstatus) = @_;
+            $status, $pubstatus, $editors) = @_;
     &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
 
     my $editlink='';
     my $editlink2='';
-    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
+    if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty|txt|css|js)$/) {
 	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/$LONCAPA::assess_re/) {
-	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=editxml">'.&mt('EditXML').'</a>)';
-	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
+        if ($editors->{'xml'}) {
+	    $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=editxml">'.&mt('EditXML').'</a>)';
+        }
+        if ($editors->{'edit'}) {
+	    $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
+        }
+    }
+    if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) {
+        if (($editors->{'daxe'}) &&
+            ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) {
+            my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
+            $editlink .= ' (<a href="'.$daxeurl.'">Daxe</a>)';
+        }
     }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
-	$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
+	$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'">'.&mt('Clean Up').')</a>';
     }
     if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
-	$editlink=' (<a target="_parent" href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
+	$editlink=' (<a href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
     }
     my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
     my $pub_select = '';
@@ -894,7 +907,7 @@ sub putresource {
 		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.
 	      '<td><span class="LC_filename">'.
-	      '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
+	      '<a href="'.$linkdir.'/'.$filename.'">'.
                $filename.'</a></span>'.$editlink2.$editlink.
 	      '</td>'.
 	      '<td>'.$title.'</td>'.