--- loncom/homework/lonhomework.pm	2018/08/14 18:24:04	1.372
+++ loncom/homework/lonhomework.pm	2024/02/21 19:50:21	1.383
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.372 2018/08/14 18:24:04 raeburn Exp $
+# $Id: lonhomework.pm,v 1.383 2024/02/21 19:50:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,8 @@ use Apache::chemresponse();
 use Apache::functionplotresponse();
 use Apache::drawimage();
 use Apache::loncapamath();
+use Apache::loncourseuser();
+use Apache::grades();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonparmset();
@@ -161,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');
 	    }
@@ -242,7 +254,8 @@ sub check_slot_access {
         $consumed_uniq = $slot{'uniqueperiod'};
         if ($slot{'iptied'}) {
             $ipused = $Apache::lonhomework::history{"$checkin.ip"};
-            unless (($ip ne '') && ($ipused eq $ip)) {
+            unless (($ip ne '') && 
+                    (($ipused eq $ip) || ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) {
                 $blockip = $slot{'iptied'};
                 $slot_name = $checkinslot;
                 $returned_slot = \%slot;
@@ -276,6 +289,12 @@ sub check_slot_access {
 	        return ('SHOW_ANSWER');
             }
         }
+    } elsif (($type eq 'problem') &&
+             ($Apache::lonhomework::browse eq 'F') &&
+             ($ENV{'REMOTE_ADDR'} eq '127.0.0.1') &&
+             ($env{'form.grade_courseid'} eq $env{'request.course.id'}) &&
+             (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) {
+        return ($status,$datemsg);
     }
 
     my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);
@@ -362,16 +381,16 @@ sub check_slot_access {
                 my $probstatus = &Apache::structuretags::get_problem_status($part);
                 my $earlyout;
                 unless (($probstatus eq 'no') ||
-                        ($probstatus eq 'no_feedback_ever')) { 
+                        ($probstatus eq 'no_feedback_ever')) {
                     if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) {
                         $numcorrect ++;
                     } else {
                         $earlyout = 1;
                     }
                 }
-                if (($currtries == $maxtries) || ($is_correct)) {
+                if ($currtries == $maxtries) {
                     $earlyout = 1;
-                } else { 
+                } else {
                     $numgraded ++;
                 }
                 last if ($earlyout);
@@ -788,6 +807,9 @@ sub setuppermissions {
 	$env{'request.course.sec'} !~ /^\s*$/) {
 	$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.
                                                '/'.$env{'request.course.sec'});
+        if ($viewgrades) {
+            $Apache::lonhomework::viewgradessec = $env{'request.course.sec'};
+        }
     }
     $Apache::lonhomework::viewgrades = $viewgrades;
 
@@ -805,6 +827,9 @@ sub setuppermissions {
 	$modifygrades = 
 	    &Apache::lonnet::allowed('mgr',$env{'request.course.id'}.
 				     '/'.$env{'request.course.sec'});
+        if ($modifygrades) {
+            $Apache::lonhomework::modifygradessec = $env{'request.course.sec'};
+        }
     }
     $Apache::lonhomework::modifygrades = $modifygrades;
 
@@ -823,7 +848,9 @@ sub setuppermissions {
 sub unset_permissions {
     undef($Apache::lonhomework::queuegrade);
     undef($Apache::lonhomework::modifygrades);
+    undef($Apache::lonhomework::modifygradessec);
     undef($Apache::lonhomework::viewgrades);
+    undef($Apache::lonhomework::viewgradessec);
     undef($Apache::lonhomework::browse);
 }
 
@@ -922,11 +949,20 @@ STATE
 
 sub analyze_header {
     my ($request) = @_;
-    my $js = &Apache::structuretags::setmode_javascript();
+    my $js = &Apache::lonxml::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' => '',
@@ -938,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 />
@@ -1154,12 +1198,21 @@ sub editxmlmode {
 	my $js =
 	    &Apache::edit::js_change_detection(). 
 	    &Apache::loncommon::resize_textarea_js().
-            &Apache::structuretags::setmode_javascript().
+            &Apache::lonxml::setmode_javascript().
             &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'}];
 
@@ -1192,29 +1245,30 @@ 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("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Problem Templates"), template_dropdown_datastructure());
 
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Response Types"), responseblock_dropdown_datastructure());
 
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Conditional Blocks"), conditional_scripting_datastructure());
 
-        $result .= Apache::lonmenu::create_submenu("#", "", 
+        $result .= Apache::lonmenu::create_submenu("#", "",
             &mt("Miscellaneous"), misc_datastructure());
     }
 
-    $result .= Apache::lonmenu::create_submenu("#", "", 
+    $result .= Apache::lonmenu::create_submenu("#", "",
         &mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") .
-        '" style="vertical-align:text-bottom; height: auto; margin:0; "/>', 
+        '" style="vertical-align:text-bottom; height: auto; margin:0; "/>',
         helpmenu_datastructure(),"");
 
     $result.="</ol></div>";
-         
-    $result .= '</div></div>' . 
+
+    $result .= '</div></div>' .
         &Apache::lonxml::message_location() .
         &Apache::loncommon::xmleditor_js() .
         '<textarea ' . &Apache::edit::element_change_detection() .
@@ -1224,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>
@@ -1250,7 +1304,7 @@ sub editxmlmode {
                 autoCloseBrackets: true,
                 height: "auto",
                 styleActiveLine: true,
-                
+
                 extraKeys: {
                     "Tab": "indentMore",
                     "Shift-Tab": "indentLess",
@@ -1271,7 +1325,7 @@ sub editxmlmode {
 #    Render the page in whatever target desired.
 #
 sub renderpage {
-    my ($request,$file,$targets,$return_string,$donebuttonmsg) = @_;
+    my ($request,$file,$targets,$return_string,$donebuttonmsg,$viewasuser,$symb) = @_;
 
     my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');
@@ -1312,6 +1366,10 @@ sub renderpage {
 	if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
 	if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');}
 
+        if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+            $env{'request.user_in_effect'} = $viewasuser;
+        }
+
 	&Apache::lonxml::debug("Should be parsing now");
 	$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
 					     &setup_vars($target),%mystyle);
@@ -1337,15 +1395,23 @@ sub renderpage {
 	    #}
 #	    $request->print($result);
 	    $overall_result.=$result;
+            if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+                my ($vuname,$vudom) = split(/:/,$viewasuser);
+                $overall_result .= &Apache::grades::view_as_user($symb,$vuname,$vudom).
+                                   '</body></html>';
+            }
 #	    $request->rflush();
 	}
+        if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+            undef($env{'request.user_in_effect'});
+        }
 	#$request->print(":Result ends");
 	#my $td=&tv_interval($t0);
     }
     if (!$return_string) {
 	&Apache::lonxml::add_messages(\$overall_result);
 	$request->print($overall_result);   
-	$request->rflush();   
+	$request->rflush();
     } else {
 	return $overall_result;
     }
@@ -1364,7 +1430,7 @@ sub finished_parsing {
 # value 3: name of help topic ???
 sub get_template_list{
     my ($extension) = @_;
-    
+
     my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
                      '/templates/*.'.$extension);
     @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
@@ -1495,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 = 
@@ -1544,7 +1619,7 @@ sub update_construct_style {
 }
 
 #
-# Sets interval for current user so time left will be zero, either for the entire folder 
+# Sets interval for current user so time left will be zero, either for the entire folder
 # containing the current resource, or just the resource, depending on value of first item
 # in interval array retrieved from EXT("resource.0.interval");
 #
@@ -1568,7 +1643,7 @@ sub zero_timer {
                         $key =~ s/\s+$//;
                         if ($env{'form.LC_interval_done_proctorpass'} ne $secret) {
                             return ('fail',
-                                   &mt('Incorrect key entered by proctor')); 
+                                   &mt('Incorrect key entered by proctor'));
                         }
                     }
                     if ($first_access+$timelimit > $now) {
@@ -1591,7 +1666,7 @@ sub zero_timer {
                             return ('ok');
                         } else {
                             return ('fail',&mt('Error ending timed event: [_1]',$result));
-                        } 
+                        }
                     } else {
                         return ('fail',&mt('Timed event already ended'));
                     }
@@ -1622,7 +1697,7 @@ sub handler {
     #check if we know where we are
     if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) {
 	# if we are browsing we might not be able to know where we are
-	if ($Apache::lonhomework::browse ne 'F' && 
+	if ($Apache::lonhomework::browse ne 'F' &&
 	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
 	    &unset_permissions();
@@ -1651,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 {
@@ -1667,16 +1748,40 @@ sub handler {
     } else {
         # Set the event timer to zero if the "done button" was clicked.  The button is
         # part of the doneButton form created in lonmenu.pm
-        my ($donebuttonresult,$donemsg);
+        my ($donebuttonresult,$donemsg,$viewasuser);
         if ($symb && $env{'form.LC_interval_done'} eq 'true') {  
             ($donebuttonresult,$donemsg) = &zero_timer($symb);
             undef($env{'form.LC_interval_done'});
             undef($env{'form.LC_interval_done_proctorpass'});
         }
+        if (($env{'form.LC_viewas'} ne '') && $symb && $env{'request.course.id'} &&
+            ($Apache::lonhomework::viewgrades || $Apache::lonhomework::modifygrades)) {
+            if ($env{'form.LC_viewas'} =~ /^($match_username):($match_domain)$/) {
+                my ($possuname,$possudom) = ($1,$2);
+                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                my ($canview,$posssec);
+                if ($env{'request.course.sec'} ne '') {
+                    if ($Apache::lonhomework::modifygradessec eq $env{'request.course.sec'}) {
+                        $canview = 'section';
+                        $posssec = $env{'request.course.sec'};
+                    } elsif ($Apache::lonhomework::viewgradessec eq $env{'request.course.sec'}) {
+                        $canview = 'section';
+                        $posssec = $env{'request.course.sec'};
+                    }
+                }
+                my $crstype = &Apache::loncommon::course_type();
+                if (&Apache::loncourseuser::is_course_user($possudom,$possuname,$cdom,$cnum,
+                                                           $canview,$crstype,$posssec)) {
+                    $viewasuser = $possuname.':'.$possudom;
+                }
+            }
+            undef($env{'form.LC_viewas'});
+        }
 	# just render the page normally outside of construction space
 	&Apache::lonxml::debug("not construct");
         undef(@Apache::lonhomework::ltipassback);
-	&renderpage($request,$file,undef,undef,$donemsg);
+	&renderpage($request,$file,undef,undef,$donemsg,$viewasuser,$symb);
         if (@Apache::lonhomework::ltipassback) {
             unless ($registered_cleanup) {
                 my $handlers = $request->get_handlers('PerlCleanupHandler');
@@ -1877,27 +1982,31 @@ sub do_ltipassback {
             if (ref($item) eq 'HASH') {
                 if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) {
                     my ($cdom,$cnum) = ($1,$2);
-                    my $ckey = $item->{'lti'}->{'key'};
-                    my $secret = $item->{'lti'}->{'secret'};
+                    my $msgformat = $item->{'lti'}->{'passbackformat'};
+                    my $sigmethod = 'HMAC-SHA1';
+                    my $ltinum = $item->{'ltinum'};
                     my $id = $item->{'pbid'};
                     my $url = $item->{'pburl'};
+                    my $type = $item->{'pbtype'};
                     my $scope = $item->{'scope'};
-                    my $map = $item->{'ltimap'};
-                    my $symb = $item->{'ltisymb'};
+                    my $map = $item->{'pbmap'};
+                    my $symb = $item->{'pbsymb'};
                     my $uname = $item->{'uname'};
                     my $udom = $item->{'udom'};
+                    my $keynum = $item->{'lti'}->{'cipher'};
+                    my $crsdef = $item->{'crsdef'};
                     my $scoretype = $item->{'format'};
                     my ($total,$possible);
                     if ($scope eq 'resource') {
                         $total = $item->{'total'};
                         $possible = $item->{'possible'};
-                    } elsif ($scope eq 'map') {
-                        ($total,$possible) = &get_lti_score($uname,$udom,$map);
+                    } elsif (($scope eq 'map') || ($scope eq 'nonrec')) {
+                        ($total,$possible) = &get_lti_score($uname,$udom,$map,$scope);
                     } elsif ($scope eq 'course') {
                         ($total,$possible) = &get_lti_score($uname,$udom);
                     }
-                    if (($ckey ne '') && ($secret ne '') && ($id ne '') && ($url ne '') && ($possible)) {
-                        &LONCAPA::ltiutils::send_grade($id,$url,$ckey,$secret,$scoretype,$total,$possible);
+                    if (($id ne '') && ($url ne '') && ($possible)) {
+                        &LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,$url,$scoretype,$sigmethod,$msgformat,$total,$possible);
                     }
                 }
             }
@@ -1907,7 +2016,7 @@ sub do_ltipassback {
 }
 
 sub get_lti_score {
-    my ($uname,$udom,$mapurl) = @_;
+    my ($uname,$udom,$mapurl,$scope) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
     if (ref($navmap)) {
         my $iterator;
@@ -1915,7 +2024,11 @@ sub get_lti_score {
             my $map = $navmap->getResourceByUrl($mapurl);
             my $firstres = $map->map_start();
             my $finishres = $map->map_finish();
-            $iterator = $navmap->getIterator($firstres,$finishres,undef,1);
+            my $recursive = 1;
+            if ($scope eq 'nonrec') {
+                $recursive = 0;
+            }
+            $iterator = $navmap->getIterator($firstres,$finishres,undef,$recursive);
         } else {
             $iterator = $navmap->getIterator(undef,undef,undef,1);
         }