--- loncom/xml/lonxml.pm	2024/03/31 02:02:32	1.531.2.24.2.3
+++ loncom/xml/lonxml.pm	2025/01/15 18:09:02	1.531.2.24.2.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.531.2.24.2.3 2024/03/31 02:02:32 raeburn Exp $
+# $Id: lonxml.pm,v 1.531.2.24.2.7 2025/01/15 18:09:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -768,6 +768,7 @@ sub init_safespace {
   $safeeval->reval('use LONCAPA::LCMathComplex;');
   $safeeval->permit_only(":default");
   $safeeval->permit("entereval");
+  $safeeval->permit("hintseval");
   $safeeval->permit(":base_math");
   $safeeval->permit("sort");
   $safeeval->permit("time");
@@ -1734,12 +1735,12 @@ FULLPAGE
           $onclick{$item} = 'onclick="is_submit=true;setmode(this.form,'."'$item'".')"';
       }
       unless ($uri =~ m{^/uploaded/}) {
-          $undo = '<input type="button" name="Undo" accesskey="u" value="'.$lt{'un'}.'" '.
+          $undo = '<input type="button" name="undo" accesskey="u" value="'.$lt{'un'}.'" '.
                   $onclick{'undo'}.' />'."\n";
       }
       $initialize .= &setmode_javascript();
       if ($filetype eq 'html') {
-          my %editors = &Apache::loncommon::permitted_editors();
+          my %editors = &Apache::loncommon::permitted_editors($uri);
           if ($editors{'daxe'}) {
               $daxebutton = '<input type="button" name="editwithdaxe" accesskey="w" value="'.$lt{'ew'}.'" '.
                             $onclick{'daxe'}.' />'."\n";
@@ -1797,14 +1798,62 @@ ENDSCRIPT
 }
 
 sub seteditor_javascript {
+    my ($is_course_doc,$is_supp,$supp_path,$supp_title) = @_;
+    my $symb;
+    if ($is_course_doc) {
+        if (!$is_supp) {
+            ($symb) = &Apache::lonnet::whichuser();
+            if ($symb) {
+                $symb = &escape($symb);
+            }
+        }
+    }
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 function seteditmode(form,editor) {
+    var querystr = '';
+    var supplemental = '$is_supp';
+    var coursedoc = '$is_course_doc';
+    if (coursedoc)  {
+        if (supplemental) {
+            var supppath = '$supp_path';
+            var supptitle = '$supp_title';
+            if (supppath) {
+                querystr = 'folderpath='+supppath;
+            }
+            if (supptitle) {
+                if (querystr) {
+                    querystr += '&';
+                }
+                querystr += 'title='+supptitle;
+            }
+        }
+    }
     if (editor == 'daxe') {
         var url = new URL(document.location.href);
-        window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+        var newloc = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+        if (querystr) {
+            if (/\\?/.test(url.pathname)) {
+                newloc += '&';
+            } else {
+                newloc += '?';
+            }
+            newloc += querystr;
+        }
+        window.location = newloc;
     } else {
+        if (coursedoc) {
+            var curraction = form.action;
+            var idx = curraction.indexOf('?');
+            if (idx !== -1) {
+                form.action = curraction.substring(0,idx);
+            }
+            form.action += '?forceedit=1&register=1';
+            if (querystr) {
+                form.action += '&'+querystr;
+            }
+        }
         if (editor == 'edit') {
             form.editmode.value = editor;
         } else {
@@ -2044,9 +2093,15 @@ ENDNOTFOUND
 	    $displayfile=$request->uri;
             if ($request->uri =~ m{^/uploaded/}) {
                 if ($env{'request.course.id'}) {
-                    if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
-                        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                                                ['folderpath','title']);
+                    if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) {
+                        if ($1 eq 'supplemental') {
+                            &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                                    ['folderpath','title']);
+                        }
+                        if (($env{'request.state'} eq 'edit') && ($env{'form.editmode'} eq 'edit') &&
+                            ($filetype eq 'html')) {
+                            &Apache::lonhtmlcommon::clear_breadcrumbs();
+                        }
                     } elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
                         my $filename = $1;
                         if ($1 eq 'loncapa.html') {