--- loncom/homework/lonhomework.pm	2023/04/02 03:16:28	1.375
+++ loncom/homework/lonhomework.pm	2023/07/23 16:11:52	1.378
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.375 2023/04/02 03:16:28 raeburn Exp $
+# $Id: lonhomework.pm,v 1.378 2023/07/23 16:11:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -371,7 +371,7 @@ 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 {
@@ -380,7 +380,7 @@ sub check_slot_access {
                 }
                 if ($currtries == $maxtries) {
                     $earlyout = 1;
-                } else { 
+                } else {
                     $numgraded ++;
                 }
                 last if ($earlyout);
@@ -942,8 +942,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' => '',
@@ -1175,8 +1184,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'}];
 
@@ -1211,27 +1229,27 @@ sub editxmlmode {
 
     unless ($env{'environment.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() .
@@ -1267,7 +1285,7 @@ sub editxmlmode {
                 autoCloseBrackets: true,
                 height: "auto",
                 styleActiveLine: true,
-                
+
                 extraKeys: {
                     "Tab": "indentMore",
                     "Shift-Tab": "indentLess",
@@ -1393,7 +1411,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')),
@@ -1524,8 +1542,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 = 
@@ -1573,7 +1600,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");
 #
@@ -1597,7 +1624,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) {
@@ -1620,7 +1647,7 @@ sub zero_timer {
                             return ('ok');
                         } else {
                             return ('fail',&mt('Error ending timed event: [_1]',$result));
-                        } 
+                        }
                     } else {
                         return ('fail',&mt('Timed event already ended'));
                     }
@@ -1651,7 +1678,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();
@@ -1930,17 +1957,19 @@ 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 $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') {
@@ -1951,9 +1980,8 @@ sub do_ltipassback {
                     } 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,$sigmethod,
-                                                       $msgformat,$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);
                     }
                 }
             }