--- loncom/interface/lonfeedback.pm	2017/11/16 16:02:58	1.370.2.1.2.1
+++ loncom/interface/lonfeedback.pm	2020/12/18 15:23:02	1.384
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.370.2.1.2.1 2017/11/16 16:02:58 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.384 2020/12/18 15:23:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -674,7 +674,7 @@ END
                                              $newpostsflag,$group,
                                              $prevread,$markondisp,$seehidden);
             $discussion .= "</table></form>\n";
-        } 
+        }
         if ($outputtarget eq 'export') {
             if ($manifestok) {
                 while ($currdepth > 0) {
@@ -960,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>
@@ -1776,14 +1781,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='';
@@ -1950,6 +1952,7 @@ END
     $anonscript
 //-->
 </script>
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END
 
   my ($textareaheader,$textareaclass);
@@ -2057,7 +2060,8 @@ END
     } else {
         $r->print(<<END);
 <p>
-$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" />
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" class="LC_flUpload" />
+<input type="hidden" id="LC_free_space" value="131072" />
 </p>
 END
     }
@@ -2068,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
@@ -2833,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" />
@@ -2841,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
@@ -2943,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);
@@ -3171,7 +3183,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'} = '';
@@ -3506,6 +3518,7 @@ sub modify_attachments {
    document.modattachments.submit();
  }
 </script> 
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END
 
     # Breadcrumbs
@@ -3547,7 +3560,10 @@ 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" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />  '.$attachmaxtext);
+    $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)){
         $r->print(&Apache::lonhtmlcommon::row_closure());
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Attachments')));
@@ -4032,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
@@ -4537,6 +4557,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;
@@ -4638,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++;