--- loncom/homework/lonhomework.pm	2023/06/04 05:27:28	1.377
+++ loncom/homework/lonhomework.pm	2023/11/17 17:02:21	1.380
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.377 2023/06/04 05:27:28 raeburn Exp $
+# $Id: lonhomework.pm,v 1.380 2023/11/17 17:02:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,9 +163,19 @@ sub get_target {
                 return ('web','answer');
             } elsif (($env{'form.problemmode'} eq 'saveedit') ||
                      ($env{'form.problemmode'} eq 'undo')) {
-                return ('modified','no_output_web','edit');
+                my %editors = &Apache::loncommon::permitted_editors();
+                if ($editors{'edit'}) {
+                    return ('modified','no_output_web','edit');
+                } else {
+                    return ('web');
+                }
             } elsif ($env{'form.problemmode'} eq 'edit') {
-		return ('no_output_web','edit');
+                my %editors = &Apache::loncommon::permitted_editors();
+                if ($editors{'edit'}) {
+		    return ('no_output_web','edit');
+                } else {
+                    return ('web');
+                }
 	    } else {
 		return ('web');
 	    }
@@ -942,8 +952,17 @@ sub analyze_header {
     my $js = &Apache::structuretags::setmode_javascript();
 
     # Breadcrumbs
-    my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                   'text' => 'Authoring Space'},
+    my $text = 'Authoring Space';
+    my $href = &Apache::loncommon::authorspace($request->uri);
+    if ($env{'request.course.id'}) {
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        if ($href eq "/priv/$cdom/$cnum/") {
+            $text = 'Course Authoring Space';
+        }
+    }
+    my $brcrum = [{'href' => $href,
+                   'text' => $text},
                   {'href' => '',
                    'text' => 'Problem Testing'},
                   {'href' => '',
@@ -955,18 +974,26 @@ sub analyze_header {
                                        {'bread_crumbs' => $brcrum,})
        .&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());
+    my %lt = &Apache::lonlocal::texthash(
+                 edit => 'Edit',
+                 editxml => 'EditXML',
+             );
     $result .= 
 	    '<form name="lonhomework" method="post" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
             '<input type="hidden" name="problemmode" value="'.
             $env{'form.problemmode'}.'" />'.
 	    &Apache::structuretags::remember_problem_state().'
-            <div class="LC_edit_problem_analyze_header">
-            <input type="button" name="submitmode" value="'.&mt("EditXML").'" '.
-            'onclick="javascript:setmode(this.form,'."'editxml'".')" />
-            <input type="button" name="submitmode" value="'.&mt('Edit').'" '.
-            'onclick="javascript:setmode(this.form,'."'edit'".')" />
-            <hr />
+            <div class="LC_edit_problem_analyze_header">';
+     my %editors = &Apache::loncommon::permitted_editors();
+     foreach my $item ('editxml','edit') {
+         next unless ($editors{$item});
+         $result .= '<input type="button" name="submitmode" value="'.$lt{$item}.'" '.
+                    'onclick="javascript:setmode(this.form,'."'$item'".')" />'.
+                    "\n";
+     }
+     $result .=
+            '<hr />
             <input type="button" name="submitmode" value="'.&mt("View").'" '.
             'onclick="javascript:setmode(this.form,'."'view'".')" />
             <hr />
@@ -1175,8 +1202,17 @@ sub editxmlmode {
             &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
 
     # Breadcrumbs
-    my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                   'text' => 'Authoring Space'},
+    my $text = 'Authoring Space';
+    my $href = &Apache::loncommon::authorspace($request->uri);
+    if ($env{'request.course.id'}) {
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        if ($href eq "/priv/$cdom/$cnum/") {
+            $text = 'Course Authoring Space';
+        }
+    }
+    my $brcrum = [{'href' => $href,
+                   'text' => $text},
                   {'href' => '',
                    'text' => 'Problem Editing'}];
 
@@ -1209,7 +1245,8 @@ sub editxmlmode {
 
     $result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">';
 
-    unless ($env{'environment.nocodemirror'}) {
+    my $nocodemirror = &Apache::loncommon::nocodemirror();
+    unless ($nocodemirror) {
         # dropdown menus
         $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Problem Templates"), template_dropdown_datastructure());
@@ -1241,7 +1278,7 @@ sub editxmlmode {
         '</textarea> <div id="LC_aftertextarea"> </div> </form>';
 
     my $resource = $env{'request.ambiguous'};
-    unless($env{'environment.nocodemirror'}){
+    unless ($nocodemirror) {
         $result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">
         <script src="/adm/codemirror/codemirror-compressed-xml.js"></script>
         <script>
@@ -1524,8 +1561,17 @@ sub newproblem {
 	my $url=&HTML::Entities::encode($request->uri,'<>&"');
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $instructions;
-        my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                       'text' => 'Authoring Space'},
+        my $text = 'Authoring Space';
+        my $href = &Apache::loncommon::authorspace($request->uri);
+        if ($env{'request.course.id'}) {
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            if ($href eq "/priv/$cdom/$cnum/") {
+                $text = 'Course Authoring Space';
+            }
+        }
+        my $brcrum = [{'href' => $href,
+                       'text' => $text},
                       {'href' => '',
                        'text' => "Create New $extension"}];
 	my $start_page = 
@@ -1680,7 +1726,13 @@ sub handler {
                      ($env{'form.problemmode'} eq 'saveeditxml') ||
                      ($env{'form.problemmode'} eq 'saveviewxml') ||
                      ($env{'form.problemmode'} eq 'undoxml')) {
-		&editxmlmode($request,$file);
+                my %editors = &Apache::loncommon::permitted_editors();
+                if (($editors{'xml'}) || ($env{'form.problemmode'} eq 'saveviewxml') || ($env{'form.problemmode'} eq 'undoxml')) {
+		    &editxmlmode($request,$file);
+                } else {
+                    &update_construct_style();
+                    &renderpage($request,$file);
+                }
 	    } elsif ($env{'form.problemmode'} eq 'calcanswers') {
 		&analyze($request,$file);
 	    } else {