--- loncom/interface/lonfeedback.pm	2021/12/31 20:39:00	1.370.2.5.2.1
+++ loncom/interface/lonfeedback.pm	2019/08/11 15:15:39	1.382
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.370.2.5.2.1 2021/12/31 20:39:00 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.382 2019/08/11 15:15:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,16 +118,10 @@ sub list_discussion {
             $outputtarget = 'export';
         }
     }
-    my ($nofooter,$nodisclink,$nofdbklink);
     if (not &discussion_visible($status)) {
         if ($mode ne 'board') {
-            ($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>";
-            }
+            &Apache::lonenc::check_encrypt(\$ressymb); 
+            return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
         }
     }
     if ($group ne '' && $mode eq 'board') {
@@ -136,27 +130,17 @@ sub list_discussion {
         }
     }
 
-    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;
+    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>";
         }
+        return $blocktext; 
     }
 
     my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
@@ -790,60 +774,33 @@ END
                           &mt('This discussion is closed.').'</span>';
         }
     } elsif ($outputtarget ne 'tex') {
-        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));
-                            }
-                        }
+        $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));
                     }
-	        } else {
-                    $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
                 }
             }
-            unless ($nofdbklink) {
-	        $discussion.= &send_message_link($ressymb);
-            }
-            $discussion.='</div>';
+	} else {
+            $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
         }
+	$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;
@@ -1003,9 +960,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>
@@ -2110,7 +2072,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
@@ -2875,6 +2837,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" />
@@ -2883,7 +2849,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
@@ -2985,12 +2951,16 @@ sub screen_header {
 				      $env{'request.course.id'}.
 				      ($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')))) {
-	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
-		$contribdisc.
-	        '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-		$anoncontrib.
-		' <i>('.$namevis.')</i></label> '.
-		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+            $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+                            $contribdisc.
+                            '</label>'; 
+            if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
+               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+	        $discussoptions .= '<br /><label><input type="radio" name="discuss" value="anon" /> '.
+		                   $anoncontrib.
+		                   ' <i>('.$namevis.')</i></label> '.
+		                   '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+            }
             my $blockblog = &Apache::loncommon::blocking_status('blogs');
             if (!$blockblog) {
                 $discussoptions.= &add_blog_checkbox($crstype);
@@ -3213,7 +3183,7 @@ sub adddiscuss {
     if (($symb) && ($email)) {
         my $now = time;
         if ($env{'form.editdisc'}) {
-            $contrib{'ip'}=&Apache::lonnet::get_requestor_ip();
+            $contrib{'ip'}=$ENV{'REMOTE_ADDR'};
             $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
             $contrib{'timestamp'} = $now;
             $contrib{'history'} = '';
@@ -3547,7 +3517,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
 
@@ -3591,7 +3561,7 @@ END
     $r->print(&Apache::lonhtmlcommon::row_closure());
     $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'}));
     $r->print('<input type="file" name="addnewattach" class="LC_flUpload" />'
-        .'<input type="hidden" id="LC_free_space" value="131072" />'
+        .'<input type="hidden" id="free_space" value="131072" />'
         .'<input type="button" name="upload" value="Upload" '
         .'onclick="this.form.submit()" />  '.$attachmaxtext);
     if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
@@ -4078,11 +4048,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
@@ -4584,7 +4558,7 @@ ENDREDIR
 	  ||
 	  ($env{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
           ||
-          (($env{'request.course.id'}) && ($feedurl =~ /ext\.tool$/))
+          (($env{'request.course.id'} && ($feedurl =~ /ext\.tool$/)))
 	  ) {
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
@@ -4686,7 +4660,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++;