--- loncom/interface/lonfeedback.pm	2012/12/17 16:05:59	1.360
+++ loncom/interface/lonfeedback.pm	2022/01/19 18:08:38	1.370.2.5.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.360 2012/12/17 16:05:59 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.370.2.5.2.2 2022/01/19 18:08:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,8 +44,8 @@ use HTML::LCParser();
 #use HTML::Tidy::libXML;
 use Apache::lonspeller();
 use Apache::longroup;
-use Cwd;
-use LONCAPA;
+use Archive::Zip qw( :ERROR_CODES );
+use LONCAPA qw(:DEFAULT :match);
 
 sub discussion_open {
     my ($status,$symb)=@_;
@@ -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");
@@ -336,12 +352,15 @@ sub list_discussion {
         'aner' => 'An error occurred opening the manifest file.',
         'difo' => 'Discussion for',
         'aerr' => 'An error occurred opening the export file for posting',
+        'discussions' => 'DISCUSSIONS'
+    );
+    my %js_lt = &Apache::lonlocal::texthash(
         'aysu' => 'Are you sure you want to delete this post?',
         'dpwn' => 'Deleted posts will no longer be visible to you and other students',
         'bwco' => 'but will continue to be visible to your instructor',
         'depo' => 'Deleted posts will no longer be visible to you or anyone else.',
-        'discussions' => 'DISCUSSIONS'
     );
+    &js_escape(\%js_lt);
 
     my $currdisp = $lt{'allposts'};
     my $currmark = $lt{'onmark'};
@@ -447,12 +466,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
            prevparm = "&amp;previous="+previous
        }
        if (caller == 'studentdelete') {
-           if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
+           if (confirm("$js_lt{'aysu'}\\n$js_lt{'dpwn'},\\n$js_lt{'bwco'}")) {
                document.location.href = "/adm/feedback?hide="+symbparm+prevparm+groupparm
            }
        } else {
            if (caller == 'seeiddelete') {
-               if (confirm("$lt{'aysu'}\\n$lt{'depo'}")) {
+               if (confirm("$js_lt{'aysu'}\\n$js_lt{'depo'}")) {
                    document.location.href = "/adm/feedback?deldisc="+symbparm+prevparm+groupparm
                }
            }
@@ -468,18 +487,18 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             my $numhidden = keys(%notshown);
             if ($numhidden > 0) {
                 my $colspan = $maxdepth+1;
-                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
-                         '<a href="/adm/feedback?allposts=1&amp;symb='.$escsymb;
+                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">';
+                my $href = '/adm/feedback?allposts=1&amp;symb='.$escsymb;
                 if ($newpostsflag) {
-                    $discussion .= '&amp;previous='.$prevread;
+                    $href .= '&amp;previous='.$prevread;
                 }
-		$discussion .= &group_args($group);
-                $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
-                         $numhidden.' ';
+		$href .= &group_args($group);
                 if ($showunmark) {
-                    $discussion .= &mt('posts previously marked read');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously marked read',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 } else {
-                    $discussion .= &mt('previously viewed posts');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously viewed',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 }
                 $discussion .= '<br/></td></tr>';
             }
@@ -562,7 +581,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                     my $postingfile;
                     my $postingfilename = $tempexport.'/'.$postfilename;
                     if ($postingfile = Apache::File->new('>'.$postingfilename)) {
-                        print $postingfile '<html><head><title>Discussion Post</title></head><body>'.
+                        print $postingfile '<html><head><title>'.&mt('Discussion Post').'</title></head><body>'.
                                            $imsitems{$alldiscussion{$post}}{'title'}.' '.
                                            $imsitems{$alldiscussion{$post}}{'sender'}.
                                            $imsitems{$alldiscussion{$post}}{'timestamp'}.'<br /><br />'.
@@ -671,7 +690,7 @@ END
                                              $newpostsflag,$group,
                                              $prevread,$markondisp,$seehidden);
             $discussion .= "</table></form>\n";
-        } 
+        }
         if ($outputtarget eq 'export') {
             if ($manifestok) {
                 while ($currdepth > 0) {
@@ -693,22 +712,34 @@ END
 
 #Create zip file in prtspool
 
-                    my $imszipfile = '/prtspool/'.
-                    $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
-                         time.'_'.rand(1000000000).'.zip';
-                    my $cwd = &getcwd(); 
-                    my $imszip = '/home/httpd/'.$imszipfile;
-                    chdir $tempexport;
-                    open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
-                    close(OUTPUT);
-                    chdir $cwd;
-                    $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive','<a href="'.$imszipfile.'">').'</a><br />';
-                    if ($copyresult) {
-                        $discussion .= &mt('The following errors occurred during export').' - <br />'.$copyresult;
+                    if (($env{'user.name'} =~ /^$match_username$/)
+                        && ($env{'user.domain'} =~ /^$match_domain$/)) {
+                        my $now = time();
+                        my $imszipfile = '/prtspool/'.
+                                      join('_',$env{'user.name'},$env{'user.domain'},$now).
+                                      '_'.rand(1000000000).'.zip';
+                        my $zip = Archive::Zip->new();
+                        $zip->addTree($tempexport);
+                        my $imszip = '/home/httpd/'.$imszipfile;
+                        if ($zip->writeToFileNamed($imszip) == AZ_OK) {
+                            $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive[_2]',
+                                           '<a href="'.$imszipfile.'">','</a>').'<br />';
+                        } else {
+                            $discussion .=  &mt('Failed to create zip file').'<br />';
+                        }
+                        if ($copyresult) {
+                            $discussion .= '<span class="LC_error">'.
+                                           &mt('The following errors occurred during export:').
+                                           '</span><br />'.$copyresult;
+                        }
+                    } else {
+                        $discussion .= '<p class="LC_error">'.
+                                       &mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating the zip file.').'</p>';
                     }
                 }
             } else {
-                $discussion .= '<br />'.&mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.').'<br />';
+                $discussion .= '<p class="LC_error">'.
+                               &mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.').'</p>';
             }
             return $discussion;
         }
@@ -759,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;
@@ -840,7 +898,7 @@ sub send_feedback_link {
                  &discussion_link($ressymb,
                     '<img alt="" class="LC_noBorder" src="'.
                     &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
-                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
+                    '" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
                     'replydisc').
            '</span>';
 }
@@ -851,7 +909,7 @@ sub send_message_link {
                  &discussion_link($ressymb,
                     '<img alt="" class="LC_noBorder" src="'.
                     &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
-                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
+                    '" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
                     'sendmessageonly').
                  '</span>';
     return $output;
@@ -926,7 +984,7 @@ sub postingform_display {
         $currnewattach,$currdelold,$group,$crstype) = @_;
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
-              'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
+             'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
              'title' => 'Title',
              'podi' => 'Post Discussion',
              'poan' => 'Post Anonymous Discussion',
@@ -1278,7 +1336,7 @@ sub build_posting_display {
                                 if (&editing_allowed($escsymb.':::'.$idx,$group)) {
                                     if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
                                         $sender.=' '.
-                                         &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         unless ($seehidden) {
                                             my $grpargs = &group_args($group);
                                             $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
@@ -1290,11 +1348,11 @@ sub build_posting_display {
 			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
  		                           $sender.=' '.
-                                            &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                            &discussion_link($ressymb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         }
 			            } else {
                                         $sender.=' '.
-                                         &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
 			            }
                                     my $grpargs = &group_args($group);
 			            $sender.= 
@@ -1333,13 +1391,13 @@ sub build_posting_display {
                                 if (($group ne '') && 
                                     (&check_group_priv($group,'pgd') eq 'ok')) {
                                      $sender.=' '.
-                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 } elsif (&Apache::lonnet::allowed('pch', 
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.
                                       $env{'request.course.sec'}:''))) {
 			             $sender.=' '.
-                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
+                                         &discussion_link($ressymb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
                                 }
                             }
 		            if ($viewgrades) {
@@ -1496,6 +1554,7 @@ sub build_posting_display {
                                     } else {
                                         $novote = &mt('No voting for hidden posts.');
                                     }
+                                    &html_escape(\$novote);
                                     $$discussionitems[$idx].=
                                         '<a href="javascript:alert('."'$novote'".');" style="text-decoration: none;">'.
                                         '<img border="0" src="/res/adm/pages/thumbsup_novote.png" alt="'.$novote.'" />&nbsp;'.
@@ -1505,12 +1564,12 @@ sub build_posting_display {
                                     if ($userlikes{$idx}) {
                                         $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
                                     } else {
-                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
+                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($ressymb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
                                     }
                                     if ($userunlikes{$idx}) {
                                         $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
                                     } else {
-                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
+                                        $$discussionitems[$idx].='&nbsp;'.&discussion_link($ressymb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
                                     }
                                 }
                             }
@@ -1528,7 +1587,7 @@ sub build_posting_display {
                                 $$discussionitems[$idx] .= '&nbsp;&nbsp;'.&mt('This post has been edited by the author.');
                                 if ($seehidden) {
                                     $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
-                                         &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                         &discussion_link($ressymb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 }
                                 $$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
                                 if ($contrib{$idx.':history'} =~ m/:/) {
@@ -1760,14 +1819,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='';
@@ -1896,6 +1952,7 @@ END
   my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,($env{'form.modal'}?'popup':0));
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
+  &js_escape(\$alert);
   my $js= <<END;
 <script type="text/javascript">
 //<!--
@@ -1933,6 +1990,7 @@ END
     $anonscript
 //-->
 </script>
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END
 
   my ($textareaheader,$textareaclass);
@@ -1952,7 +2010,7 @@ END
 
   my %onload = ('onload' => 'window.focus();setposttype();');
   my %parms=('add_entries' => \%onload);
-  if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+  if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
   my $start_page=
       &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms);
 
@@ -2040,7 +2098,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
     }
@@ -2129,6 +2188,11 @@ sub print_display_options {
         'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
         'ywbr' => 'You will be returned to the previous page if you click OK.'
     );
+    my %js_lt = &Apache::lonlocal::texthash(
+        'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
+        'ywbr' => 'You will be returned to the previous page if you click OK.'
+    );
+    &js_escape(\%js_lt);
 
     my $dispchangeA = $lt{'unread'};
     my $dispchangeB = $lt{'unmark'};
@@ -2222,7 +2286,7 @@ function setDisp() {
     if (chktotal > 0) { 
         document.modifydisp.submit()
     } else {
-        if(confirm("$lt{'yhni'}. \\n$lt{'ywbr'}"))      {
+        if(confirm("$js_lt{'yhni'}. \\n$js_lt{'ywbr'}"))      {
             if (prev > 0) {
                 location.href = "$feedurl?previous=$previous"
             } else {
@@ -2582,7 +2646,7 @@ sub print_showposters {
     my $table_start =&Apache::loncommon::start_data_table();
     $r->print(<<END);
 $start_page
- <form name="pickpostersform" method="post">
+ <form name="pickpostersform" method="post" action="">
  <br />
     $table_start
       <tr>
@@ -2682,29 +2746,46 @@ sub get_post_attachments {
         $$attachments{'0'}{'filename'} = $attachmenturls;
         $$attachments{'0'}{'0'} = 'n';
     }
-
     return;
 }
 
 sub fail_redirect {
-  my ($r,$feedurl) = @_;
+  my ($r,$feedurl,$delay) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   my %lt = &Apache::lonlocal::texthash(
                  'sorr' => 'Sorry, no recipients ...',
   );
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-  $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,
-					   {'redirect'  => [2,$feedurl],
-					    'only_body' => 1,}));
+  my %parms=('only_body'   => 1);
+  if ($delay !~ /^\d+(|\.\d+)$/) {
+      $delay = 2;
+  }
+  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];
+  }
+  $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,\%parms));
+  my $windowname = 'loncapaclient';
   $r->print(<<ENDFAILREDIR);
 <img align="right" src="$logo" />
 <p class="LC_warning">$lt{'sorr'}</p>
+<form name="reldt" action="$feedurl" target="$windowname">
+</form>
 ENDFAILREDIR
   $r->print(&Apache::loncommon::end_page());
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,
+      $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge,$delay) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
@@ -2803,10 +2884,20 @@ 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'}) {
-      $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'};
+      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'}=[0,$feedurl];
+      $parms{'redirect'}=[$delay,$feedurl];
   }
   my $start_page=
       &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
@@ -2834,39 +2925,59 @@ ENDREDIR
 }
 
 sub no_redirect_back {
-  my ($r,$feedurl) = @_;
+  my ($r,$feedurl,$delay) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
- 
-  my %onload;
-
-  my %body_options = ('only_body'   => 1,
-		      'bgcolor'     => '#FFFFFF',
-		      'add_entries' => \%onload,);
-
-  if ($feedurl !~ m{^/adm/feedback}) { 
-      $body_options{'redirect'} = [2,$feedurl];
+  my $form_for_modal;
+  my %parms=('only_body'   => 1,
+             'bgcolor'     => '#FFFFFF',);
+  if ($delay !~ /^\d+(|\.\d+)$/) {
+      $delay = 0;
+  }
+  if ($env{'form.modal'}) {
+      if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) {
+          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};
+          my $windowname = 'loncapaclient'; 
+          $form_for_modal = <<ENDFORM;
+<form name="reldt" action="$feedurl" target="$windowname">
+</form>
+ENDFORM
+      }
+  } else {
+      if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) {
+          $parms{'redirect'}=[$delay,$feedurl];
+      }
   }
   my $start_page=
       &Apache::loncommon::start_page('Feedback not sent',undef,
-				     \%body_options);
-				      
+				     \%parms);
+
   my $end_page = &Apache::loncommon::end_page();
 
-  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
 $start_page
 <img align="right" src="$logo" />
 <b>$nofeed</b>
 <br />
+$form_for_modal
 $end_page
 ENDNOREDIRTWO
 }
 
 sub screen_header {
     my ($feedurl,$symb,$group) = @_;
-    my $crscontent = &mt('Question/Comment/Feedback about course content');
-    my $crspolicy = &mt('Question/Comment/Feedback about course policy');
+    my %default = &Apache::lonlocal::texthash (
+                    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');
@@ -2874,8 +2985,8 @@ sub screen_header {
     if ($env{'request.course.id'}) {
         $crstype = &Apache::loncommon::course_type();
         if ($crstype eq 'Community') {
-            $crscontent = &mt('Question/Comment/Feedback about community content');
-            $crspolicy = &mt('Question/Comment/Feedback about community policy');
+            $default{'comment'} = &mt('Question/Comment/Feedback about community content');
+            $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');
@@ -2883,56 +2994,78 @@ sub screen_header {
     }
     my $msgoptions='';
     my $discussoptions='';
+    my $checkradio = '';
+    my $blockblog;
+    my (%fdbkoptions,%discoptions);
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
-	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
-	    $msgoptions= 
-		'<label><input type="radio" name="discuss" value="author" /> '.
-		&mt('Feedback to resource author').'</label><br />';
-	}
-        my %optionhash=();
-        foreach my $type ('question','comment','policy') {
-	    $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
-	}
-	if (&feedback_available(1)) {
-	    $msgoptions.=
-		'<label><input type="radio" name="discuss" value="question" /> '.
-		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label><br />';
-	}
-	if (&feedback_available(0,1)) {
-	    $msgoptions.=
-		'<label><input type="radio" name="discuss" value="course" /> '.
-		($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
-		'</label><br />';
-	}
-	if (&feedback_available(0,0,1)) {
-	    $msgoptions.=
-		'<label><input type="radio" name="discuss" value="policy" /> '.
-		($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
-		'</label><br />';
-	}
+        if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
+            $fdbkoptions{'author'} = 1;
+        }
+        if (&feedback_available(1)) {
+            $fdbkoptions{'question'} = 1;
+        }
+        if (&feedback_available(0,1)) {
+            $fdbkoptions{'course'} = 1;
+        }
+        if (&feedback_available(0,0,1)) {
+            $fdbkoptions{'policy'} = 1;
+        }
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
         my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $realsymb = &get_realsymb($symb);
-        if (!$blocked && &discussion_open(undef,$realsymb) && 
-	    (&Apache::lonnet::allowed('pch',
-				      $env{'request.course.id'}.
-				      ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || 
+        if (!$blocked && &discussion_open(undef,$realsymb) &&
+            (&Apache::lonnet::allowed('pch',
+                                      $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>';
-            my $blockblog = &Apache::loncommon::blocking_status('blogs');
-            if (!$blockblog) {
-                $discussoptions.= &add_blog_checkbox($crstype);
+            $discoptions{'nonanon'} = 1;
+            $discoptions{'anon'} = 1;
+            $blockblog = &Apache::loncommon::blocking_status('blogs');
+        }
+    }
+    my $total = scalar(keys(%fdbkoptions)) + scalar(keys(%discoptions));
+    return if (!$total);
+    if ($total == 1) {
+        $checkradio = ' checked="checked"';
+    }
+    if (keys(%fdbkoptions)) {
+        if ($fdbkoptions{'author'}) {
+            $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') {
+                $type = 'course';
+            }
+            my $optionhash=$env{'course.'.$env{'request.course.id'}.'.'.$item.'.email.text'};
+            if ($fdbkoptions{$type}) {
+                $msgoptions .=
+                    '<label><input type="radio" name="discuss" value="'.$type.'"'.$checkradio.' />'.
+                    ($optionhash?$optionhash:$default{$item}).'</label><br />';
             }
         }
     }
+    if (keys(%discoptions)) {
+        if ($discoptions{'nonanon'}) {
+            $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+                            $contribdisc.
+                            '</label>';
+        }
+        if ($discoptions{'anon'}) {
+            $discussoptions .= '<br /><label><input type="radio" name="discuss" value="anon"'.$checkradio.' /> '.
+                               $anoncontrib.
+                               ' <i>('.$namevis.')</i></label> '.
+                               '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
+        }
+        if (!$blockblog) {
+            $discussoptions.= &add_blog_checkbox($crstype);
+        }
+    }
     if ($msgoptions) {
         $msgoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
                    .'<br />'.&mt('Send Feedback').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</th>'.
@@ -3018,9 +3151,17 @@ sub feedback_available {
 }
 
 sub send_msg {
-    my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
+    my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,$clientip,%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'); }
@@ -3034,7 +3175,8 @@ sub send_msg {
 	    } else {
 		unless (&Apache::lonmsg::user_normal_msg($user,$domain,
 							 $title.' ['.$restitle.']',$email,$citations,$feedurl,
-							 $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
+							 $attachmenturl,undef,undef,$symb,$restitle,undef,
+                                                         undef,undef,undef,$senthide)=~/ok/) {
 		    $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
 		} else {
 		    $sendsomething++;
@@ -3042,6 +3184,24 @@ 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:
@@ -3059,7 +3219,7 @@ sub send_msg {
 	    }
         }
     }
-    return ($status,$sendsomething);
+    return ($status,$sendsomething,$delay);
 }
 
 # Routine to get the complete feedback records
@@ -3149,7 +3309,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'} = '';
@@ -3483,14 +3643,15 @@ 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
 
     # Breadcrumbs
     my $brcrum = [{'href' => '',
                    'text' => 'Discussion Post Attachments'}];
     my %parms=('only_body' => 1);
-    if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+    if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
 
     my $start_page = 
 	&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms);
@@ -3525,7 +3686,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')));
@@ -3866,8 +4030,9 @@ sub handler {
           my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
           my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           my $feedurl=&Apache::lonnet::clutter($url);
-          &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />',                     '0','0','','',$env{'form.previous'},undef,undef,undef,
-                    undef,undef,undef,$group);
+          &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />',
+                         '0','0','','',$env{'form.previous'},undef,undef,undef,
+                         undef,undef,undef,$group);
           return OK;
       }
   } 
@@ -3908,7 +4073,7 @@ sub handler {
                      'text' => 'Discussion Post Versions'}];
       
       my %parms=();
-      if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+      if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
 
       $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms));
 
@@ -3990,9 +4155,9 @@ sub handler {
           $discinfo{$lastkey} = $env{'form.navtime'};
       }
       my $textline = '<b>'.
-                     &mt('Marked "New" posts as read in a total of [_1] resources/bulletin boards.',
+                     &mt('Marked "New" posts as read in a total of [_1] resources/discussion boards.',
                          $numitems).
-                     '</b>";
+                     '</b>';
       if ($numitems > 0) {
           &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
 			     \%discinfo,$env{'user.domain'},$env{'user.name'});
@@ -4074,7 +4239,7 @@ ENDREDIR
       unless (($seehidden) || (&editing_allowed($env{'form.hide'},$group))) {
           &redirect_back($r,$feedurl,&mt('Hiding not permitted').'<br />',
                          '0','0','','',$env{'form.previous'},'','','','',
-                         undef,undef,$group,);
+                         undef,undef,$group);
           return OK;
       }
 
@@ -4423,6 +4588,7 @@ ENDREDIR
                                                 $cdom,$cnum);
           $contrib{'deleted'} =~ s/^\.//;
           $contrib{'deleted'} =~ s/\.$//;
+          my $confirm_msg;
           if ($contrib{'deleted'} ne '') {
               if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
                                           $cdom,$cnum) eq 'ok') {
@@ -4450,14 +4616,19 @@ ENDREDIR
                                             $uname,$udom,$env{'request.course.id'},
                                             'undelete');
                   }
-                  $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
+                  $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries"));
               } else {
-                  $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
+                  $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1);
               }
           } else {
-              $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1));
+              $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1);
           }
-          $r->print("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+          $r->print(
+              '<br />'
+             .&Apache::loncommon::confirmwrapper($confirm_msg)
+             .&Apache::lonhtmlcommon::actionbox(
+                  ["<a href='$feedurl'>".&mt("Return and reload")."</a>"])
+          );
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;
@@ -4500,6 +4671,12 @@ ENDREDIR
 	  $r->internal_redirect('/adm/ambiguous');
 	  return OK;
       }
+      if ($feedurl eq '') {
+          &Apache::loncommon::content_type($r,'text/html');
+          $r->send_http_header;
+          &no_redirect_back($r);
+          return OK;
+      }
 # Go ahead with feedback, no ambiguous reference
       unless (
 	  (
@@ -4509,12 +4686,14 @@ 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;
 # Unable to give feedback
           &Apache::lonenc::check_encrypt(\$feedurl);
-	  &no_redirect_back($r,$feedurl);
+	  &no_redirect_back($r,$feedurl,2);
 	  return OK;
       }
 # --------------------------------------------------- Print login screen header
@@ -4534,7 +4713,7 @@ ENDREDIR
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
-	      &fail_redirect($r,$feedurl);
+	      &fail_redirect($r,$feedurl,2);
 	  }
 	  return OK;
       }
@@ -4600,9 +4779,10 @@ ENDREDIR
       my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
 
 # Actually send mail
-      my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),
-				      $feedurl,$email,$citations,
-				      $attachmenturl,$usersymb,%to);
+      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);
 
 # Discussion? Store that.
       my $numpost=0;
@@ -4633,7 +4813,8 @@ 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);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},
+                     undef,undef,undef,undef,undef,undef,$group,$toolarge,$delay);
   }
   return OK;
 }