--- loncom/interface/lonfeedback.pm	2023/09/15 23:02:08	1.370.2.7
+++ loncom/interface/lonfeedback.pm	2022/01/18 16:55:30	1.388
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.370.2.7 2023/09/15 23:02:08 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.388 2022/01/18 16:55:30 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') {
@@ -130,17 +136,27 @@ sub list_discussion {
         }
     }
 
-    my ($blocked,$blocktext) = 
-        &Apache::loncommon::blocking_status('boards');
-    if ($blocked) {
-        $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>';
-        }else{
-            $blocktext.="</div>";
+    unless ($outputtarget eq 'export') {
+        ($nofooter,$nodisclink,$nofdbklink) = &check_menucoll();
+    }
+
+    unless ($nofooter) {
+        my ($blocked,$blocktext) = 
+            &Apache::loncommon::blocking_status('boards');
+        if ($blocked) {
+            my $footer = '<br /><div class="LC_feedback_link">';
+            unless ($nodisclink) {
+                $footer .= '<span class="LC_feedback_link">'.$blocktext.'</span>';
+            }
+            &Apache::lonenc::check_encrypt(\$ressymb);
+            if ($mode ne 'board') {
+                unless ($nofdbklink) {
+                    $footer.=&send_message_link($ressymb);
+                }
+            }
+            $footer.='</div>';
+            return $footer;
         }
-        return $blocktext; 
     }
 
     my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
@@ -674,7 +690,7 @@ END
                                              $newpostsflag,$group,
                                              $prevread,$markondisp,$seehidden);
             $discussion .= "</table></form>\n";
-        } 
+        }
         if ($outputtarget eq 'export') {
             if ($manifestok) {
                 while ($currdepth > 0) {
@@ -774,33 +790,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;
@@ -960,9 +1003,14 @@ sub postingform_display {
             }
         }
     }
+    my $postanon;
+    if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
+       ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+        $postanon = '<input type="submit" name="anondiscuss" value="'.$lt{'poan'}.'" />';
+    }
     $postingform .= (<<ENDDISCUSS);
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
-<input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
+$postanon<input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />
 <input type="hidden" name="timestamp" value="$now" />
 <a name="newpost"></a>
@@ -2067,7 +2115,7 @@ END
         $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
     }
     $r->print(<<END);
-<input type="hidden" name="sendit" value="1" />
+<input type="hidden" name="sendit" value="1" /><br /><br />
 <input type="button" value="$send" onclick='gosubmit();' />
 </form>
 END
@@ -2715,7 +2763,7 @@ sub fail_redirect {
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %parms=('only_body'   => 1);
   if ($delay !~ /^\d+(|\.\d+)$/) {
-      $delay = 2;
+      $delay = 0;
   }
   if ($env{'form.modal'}) {
       my $onload = 'document.forms.reldt.submit()';
@@ -2731,6 +2779,9 @@ sub fail_redirect {
   }
   $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,\%parms));
   my $windowname = 'loncapaclient';
+  if ($env{'request.lti.login'}) {
+     $windowname .= 'lti';
+  }
   $r->print(<<ENDFAILREDIR);
 <img align="right" src="$logo" />
 <p class="LC_warning">$lt{'sorr'}</p>
@@ -2742,7 +2793,7 @@ ENDFAILREDIR
 
 sub redirect_back {
   my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,
-      $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge,$delay) = @_;
+      $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
@@ -2841,24 +2892,19 @@ sub redirect_back {
   &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %parms=('only_body'   => 1);
-  if ($delay !~ /^\d+(|\.\d+)$/) {
-      $delay = 0;
-  }
   if ($env{'form.modal'}) {
       my $onload = 'document.forms.reldt.submit()';
-      if ($delay) {
-          my $js_delay = int(1000 * $delay);
-          $onload = "setTimeout(function(){
-                        document.forms.reldt.submit();
-                     },$js_delay);";
-      }
       $parms{'add_entries'}={'onload' => $onload};
   } else {
-      $parms{'redirect'}=[$delay,$feedurl];
+      $parms{'redirect'}=[0,$feedurl];
   }
   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" />
@@ -2867,7 +2913,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
@@ -2901,6 +2947,9 @@ sub no_redirect_back {
           }
           $parms{'add_entries'}={'onload' => $onload};
           my $windowname = 'loncapaclient';
+          if ($env{'request.lti.login'}) {
+              $windowname .= 'lti';
+          }
           $form_for_modal = <<ENDFORM;
 <form name="reldt" action="$feedurl" target="$windowname">
 </form>
@@ -2911,6 +2960,7 @@ ENDFORM
           $parms{'redirect'}=[$delay,$feedurl];
       }
   }
+ 
   my $start_page=
       &Apache::loncommon::start_page('Feedback not sent',undef,
 				     \%parms);
@@ -2934,7 +2984,7 @@ sub screen_header {
                     question => 'Question about resource content',
                     comment => 'Question/Comment/Feedback about course content',
                     policy => 'Question/Comment/Feedback about course policy',
-                  );
+                  );  
     my $contribdisc = &mt('Contribution to course discussion of resource');
     my $anoncontrib = &mt('Anonymous contribution to course discussion of resource');
     my $namevis = &mt('name only visible to course faculty');
@@ -2943,7 +2993,7 @@ sub screen_header {
         $crstype = &Apache::loncommon::course_type();
         if ($crstype eq 'Community') {
             $default{'comment'} = &mt('Question/Comment/Feedback about community content');
-            $default{'policy'} = &mt('Question/Comment/Feedback about community policy');
+            $default{'policy'} = &mt('Question/Comment/Feedback about community policy'); 
             $contribdisc = &mt('Contribution to community discussion of resource');
             $anoncontrib = &mt('Anonymous contribution to community discussion of resource');
             $namevis = &mt('name only visible to community facilitators');
@@ -2976,10 +3026,13 @@ sub screen_header {
         if (!$blocked && &discussion_open(undef,$realsymb) &&
             (&Apache::lonnet::allowed('pch',
                                       $env{'request.course.id'}.
-                                      ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || 
+                                      ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) ||
             (($group ne '') && ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$}) && (&check_group_priv($group,'pgd') eq 'ok')))) {
             $discoptions{'nonanon'} = 1;
-            $discoptions{'anon'} = 1;
+            if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
+               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+                $discoptions{'anon'} = 1;
+            }
             $blockblog = &Apache::loncommon::blocking_status('blogs');
         }
     }
@@ -2990,10 +3043,10 @@ sub screen_header {
     }
     if (keys(%fdbkoptions)) {
         if ($fdbkoptions{'author'}) {
-            $msgoptions =
-                '<label><input type="radio" name="discuss" value="author"'.$checkradio.' /> '.
-                &mt('Feedback to resource author').'</label><br />';
-        }
+	    $msgoptions =
+		'<label><input type="radio" name="discuss" value="author"'.$checkradio.' /> '.
+		&mt('Feedback to resource author').'</label><br />';
+	}
         foreach my $item ('question','comment','policy') {
             my $type = $item;
             if ($item eq 'comment') {
@@ -3003,8 +3056,8 @@ sub screen_header {
             if ($fdbkoptions{$type}) {
                 $msgoptions .=
                     '<label><input type="radio" name="discuss" value="'.$type.'"'.$checkradio.' />'.
-                    ($optionhash?$optionhash:$default{$item}).'</label><br />';
-            }
+                    ($optionhash?$optionhash:$default{$item}).'</label><br />'; 
+	    }
         }
     }
     if (keys(%discoptions)) {
@@ -3108,17 +3161,9 @@ sub feedback_available {
 }
 
 sub send_msg {
-    my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,$clientip,%to)=@_;
+    my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
     my $status='';
     my $sendsomething=0;
-    my $delay;
-    my $senthide;
-    my %setters;
-    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
-        &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
-    if ($by_ip) {
-        $senthide = 1;
-    }
     my $restitle = &get_resource_title($symb,$feedurl);
     if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
     unless ($title=~/\w/) { $title=&mt('Feedback'); }
@@ -3132,8 +3177,7 @@ sub send_msg {
 	    } else {
 		unless (&Apache::lonmsg::user_normal_msg($user,$domain,
 							 $title.' ['.$restitle.']',$email,$citations,$feedurl,
-							 $attachmenturl,undef,undef,$symb,$restitle,undef,
-                                                         undef,undef,undef,$senthide)=~/ok/) {
+							 $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
 		    $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
 		} else {
 		    $sendsomething++;
@@ -3141,24 +3185,6 @@ sub send_msg {
 	    }
 	}
     }
-    if ($sendsomething && $senthide) {
-        if ($by_ip) {
-            my $showdom = &Apache::lonnet::domain($blockdom);
-            if ($showdom eq '') {
-                $showdom = $blockdom;
-            }
-            $delay = 4;
-            $status.='<br />'.&mt("Message content of feedback you send to instructor(s) from your current IP address: [_1] will be unavailable in your 'Sent' folder.",$clientip).
-                     '<ul><li>'.
-                     &mt('This does not affect delivery of feedback to your instructor(s).').
-                     '</li><li>'.
-                     &mt('Note: some types of communication functionality are blocked for certain IP address(es).').
-                     '</li><li>'.
-                     &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',
-                         $showdom).
-                     '</li></ul><br />';
-        }
-    }
 
 # Records of number of feedback messages are kept under the "symb" called "_feedback"
 # There are two entries within the framework of a course:
@@ -3176,7 +3202,7 @@ sub send_msg {
 	    }
         }
     }
-    return ($status,$sendsomething,$delay);
+    return ($status,$sendsomething);
 }
 
 # Routine to get the complete feedback records
@@ -3600,7 +3626,7 @@ sub modify_attachments {
    document.modattachments.action = document.modattachments.origpage.value;
    document.modattachments.submit();
  }
-</script>
+</script> 
 <script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END
 
@@ -4132,11 +4158,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
@@ -4643,6 +4673,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;
@@ -4668,7 +4700,7 @@ ENDREDIR
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
-	      &fail_redirect($r,$feedurl,2);
+	      &fail_redirect($r,$feedurl,1);
 	  }
 	  return OK;
       }
@@ -4687,7 +4719,7 @@ ENDREDIR
       my $usersymb = &Apache::lonenc::check_encrypt($symb);
       my $useranswer=
           &Apache::loncommon::get_student_answers(
-              $symb,$env{'user.name'},$env{'user.domain'},
+              $usersymb,$env{'user.name'},$env{'user.domain'},
               $env{'request.course.id'});
       &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
@@ -4734,10 +4766,9 @@ ENDREDIR
       my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
 
 # Actually send mail
-      my $clientip = &Apache::lonnet::get_requestor_ip($r);
-      my ($status,$numsent,$delay)=&send_msg(&clear_out_html($env{'form.subject'}),
-				             $feedurl,$email,$citations,
-				             $attachmenturl,$usersymb,$clientip,%to);
+      my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),
+				      $feedurl,$email,$citations,
+				      $attachmenturl,$usersymb,%to);
 
 # Discussion? Store that.
       my $numpost=0;
@@ -4745,7 +4776,11 @@ ENDREDIR
 	     && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
 	   || $env{'form.anondiscuss'} ne '') {
 	  my $subject = &clear_out_html($env{'form.subject'});
-	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
+          my $anonmode;
+          if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
+             ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+	      $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
+          }
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
 				  $subject,$group);
 	  $numpost++;
@@ -4769,7 +4804,7 @@ ENDREDIR
 	  
 # Receipt screen and redirect back to where came from
       &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},
-                     undef,undef,undef,undef,undef,undef,$group,$toolarge,$delay);
+                     undef,undef,undef,undef,undef,undef,$group,$toolarge);
   }
   return OK;
 }