--- loncom/interface/lonfeedback.pm	2017/12/18 22:36:52	1.377
+++ loncom/interface/lonfeedback.pm	2021/10/18 22:29:20	1.385
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.377 2017/12/18 22:36:52 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.385 2021/10/18 22:29:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,10 +118,16 @@ sub list_discussion {
             $outputtarget = 'export';
         }
     }
+    my ($nofooter,$nodisclink,$nofdbklink);
     if (not &discussion_visible($status)) {
         if ($mode ne 'board') {
-            &Apache::lonenc::check_encrypt(\$ressymb); 
-            return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
+            ($nofooter,$nodisclink,$nofdbklink) = &check_menucoll();
+            if ($nofooter || $nofdbklink) {
+                return '<br />';
+            } else {
+                &Apache::lonenc::check_encrypt(\$ressymb);
+                return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
+            }
         }
     }
     if ($group ne '' && $mode eq 'board') {
@@ -136,13 +142,21 @@ sub list_discussion {
         $blocktext = '<br /><div class="LC_feedback_link"><span class="LC_feedback_link">'.$blocktext."</span>";
         &Apache::lonenc::check_encrypt(\$ressymb);
         if ($mode ne 'board') {
-            $blocktext.=&send_message_link($ressymb).'</div>';
+            ($nofooter,$nodisclink,$nofdbklink) = &check_menucoll();
+            unless ($nofooter || $nofdbklink) {
+                $blocktext.=&send_message_link($ressymb);
+            }
+            $blocktext.='</div>';
         }else{
             $blocktext.="</div>";
         }
         return $blocktext; 
     }
 
+    unless ($outputtarget eq 'export') {
+        ($nofooter,$nodisclink,$nofdbklink) = &check_menucoll();
+    }
+
     my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
@@ -774,33 +788,60 @@ END
                           &mt('This discussion is closed.').'</span>';
         }
     } elsif ($outputtarget ne 'tex') {
-        $discussion.='<div class="LC_feedback_link">';
-        if (&discussion_open($status) &&
-            &Apache::lonnet::allowed('pch',
-    	        $env{'request.course.id'}.
-	        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-            $discussion.= &send_feedback_link($ressymb);
-            if ($env{'request.role.adv'}) {
-                my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb);
-                my $canvote = &Apache::lonnet::EXT('resource.0.discussvote',$ressymb);
-                if (defined($close) && $close ne '' && $close < time) {
-                    if ($canvote eq 'notended') {
-                        $discussion .= '&nbsp;'.&mt('(Posting and voting closed for [_1] roles)',
-                                                    &Apache::lonnet::plaintext('st',$crstype));
-                    } else {
-                        $discussion .= '&nbsp;'.&mt('(Closed for [_1] roles)',
-                                                    &Apache::lonnet::plaintext('st',$crstype));
+        unless ($nofooter) {
+            $discussion.='<div class="LC_feedback_link">';
+            unless ($nodisclink) {
+                if (&discussion_open($status) &&
+                    &Apache::lonnet::allowed('pch',
+    	                $env{'request.course.id'}.
+	                ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+                    $discussion.= &send_feedback_link($ressymb);
+                    if ($env{'request.role.adv'}) {
+                        my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb);
+                        my $canvote = &Apache::lonnet::EXT('resource.0.discussvote',$ressymb);
+                        if (defined($close) && $close ne '' && $close < time) {
+                            if ($canvote eq 'notended') {
+                                $discussion .= '&nbsp;'.&mt('(Posting and voting closed for [_1] roles)',
+                                                            &Apache::lonnet::plaintext('st',$crstype));
+                            } else {
+                                $discussion .= '&nbsp;'.&mt('(Closed for [_1] roles)',
+                                                            &Apache::lonnet::plaintext('st',$crstype));
+                            }
+                        }
                     }
+	        } else {
+                    $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
                 }
             }
-	} else {
-            $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
+            unless ($nofdbklink) {
+	        $discussion.= &send_message_link($ressymb);
+            }
+            $discussion.='</div>';
         }
-	$discussion.= &send_message_link($ressymb).'</div>';
     }
     return $discussion;
 }
 
+sub check_menucoll {
+    my ($nofooter,$nodisclink,$nofdbklink);
+    my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect();
+    if ($menucoll) {
+        if (ref($menuref) eq 'HASH') {
+            if ($menuref->{'foot'} eq 'n') {
+                $nofooter = 1;
+            } else {
+                unless ($menuref->{'disc'}) {
+                    $nodisclink = 1;
+                }
+                unless ($menuref->{'fdbk'}) {
+                    $nofdbklink = 1;
+                }
+            }
+        }
+    }
+    return ($nofooter,$nodisclink,$nofdbklink);
+}
+
 sub can_see_hidden {
     my ($mode,$ressymb,$feedurl,$group,$cdom,$cnum,$crs) = @_;
     my $seehidden;
@@ -1781,14 +1822,11 @@ sub mail_screen {
 
   my %lt = &Apache::lonlocal::texthash(
             'myqu' => 'Question/comment/feedback:',
-            'title' => 'Title',
             'reta' => 'Retained attachments',
             'atta' => 'Attachment',
            );
-  if($env{'form.editdisc'} || $env{'form.replydisc'}){
-    %lt = &Apache::lonlocal::texthash(
-            'myqu' => 'Post Discussion',
-    );
+  if ($env{'form.editdisc'} || $env{'form.replydisc'}){
+      $lt{'myqu'} = &mt('Post Discussion');
   }
   my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
@@ -2063,8 +2101,8 @@ END
     } else {
         $r->print(<<END);
 <p>
-$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" class="flUpload" />
-<input type="hidden" id="free_space" value="131072" />
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" class="LC_flUpload" />
+<input type="hidden" id="LC_free_space" value="131072" />
 </p>
 END
     }
@@ -2840,6 +2878,10 @@ sub redirect_back {
   my $start_page=
       &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
   my $end_page = &Apache::loncommon::end_page();
+  my $windowname = 'loncapaclient';
+  if ($env{'request.lti.login'}) {
+     $windowname .= 'lti';
+  }
   $r->print(<<ENDREDIR);
 $start_page
 <img align="right" src="$logo" />
@@ -2848,7 +2890,7 @@ $typestyle
 $blog
 $toolarge
 <font color="red">$status</font>
-<form name="reldt" action="$feedurl" target="loncapaclient">
+<form name="reldt" action="$feedurl" target="$windowname">
 $prevtag
 $sorttag
 $statustag
@@ -3182,7 +3224,7 @@ sub adddiscuss {
     if (($symb) && ($email)) {
         my $now = time;
         if ($env{'form.editdisc'}) {
-            $contrib{'ip'}=$ENV{'REMOTE_ADDR'};
+            $contrib{'ip'}=&Apache::lonnet::get_requestor_ip();
             $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
             $contrib{'timestamp'} = $now;
             $contrib{'history'} = '';
@@ -3559,8 +3601,8 @@ END
     $r->print('<b>'.$subject.'</b>');
     $r->print(&Apache::lonhtmlcommon::row_closure());
     $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'}));
-    $r->print('<input type="file" name="addnewattach" class="flUpload" />'
-        .'<input type="hidden" id="free_space" value="131072" />'
+    $r->print('<input type="file" name="addnewattach" class="LC_flUpload" />'
+        .'<input type="hidden" id="LC_free_space" value="131072" />'
         .'<input type="button" name="upload" value="Upload" '
         .'onclick="this.form.submit()" />  '.$attachmaxtext);
     if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
@@ -4047,11 +4089,15 @@ sub handler {
 					  'only_body'   => 1,
 					  'add_entries' => \%onload});
       my $end_page = &Apache::loncommon::end_page();
+      my $windowname = 'loncapaclient';
+      if ($env{'request.lti.login'}) {
+          $windowname .= 'lti';
+      }
       $r->print (<<ENDREDIR);
 $start_page
 <img align="right" src="$logo" />
 $textline
-<form name="reldt" action="$feedurl" target="loncapaclient">
+<form name="reldt" action="$feedurl" target="$windowname">
 </form>
 <br />
 $end_page
@@ -4552,6 +4598,8 @@ ENDREDIR
 	  ($env{'request.course.id'} && ($feedurl!~m:^/adm:))
 	  ||
 	  ($env{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
+          ||
+          (($env{'request.course.id'} && ($feedurl =~ /ext\.tool$/)))
 	  ) {
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;