--- loncom/interface/lonfeedback.pm	2022/11/14 15:12:30	1.370.2.5.2.3
+++ loncom/interface/lonfeedback.pm	2017/05/30 00:01:32	1.373
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.370.2.5.2.3 2022/11/14 15:12:30 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.373 2017/05/30 00:01:32 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 Archive::Zip qw( :ERROR_CODES );
-use LONCAPA qw(:DEFAULT :match);
+use Cwd;
+use LONCAPA;
 
 sub discussion_open {
     my ($status,$symb)=@_;
@@ -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");
@@ -690,7 +674,7 @@ END
                                              $newpostsflag,$group,
                                              $prevread,$markondisp,$seehidden);
             $discussion .= "</table></form>\n";
-        }
+        } 
         if ($outputtarget eq 'export') {
             if ($manifestok) {
                 while ($currdepth > 0) {
@@ -712,29 +696,21 @@ END
 
 #Create zip file in prtspool
 
-                    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]',
+                    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[_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>';
+                    if ($copyresult) {
+                        $discussion .= '<span class="LC_error">'.
+                                       &mt('The following errors occurred during export:').
+                                       '</span><br />'.$copyresult;
                     }
                 }
             } else {
@@ -790,60 +766,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;
@@ -898,7 +847,7 @@ sub send_feedback_link {
                  &discussion_link($ressymb,
                     '<img alt="" class="LC_noBorder" src="'.
                     &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
-                    '" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
+                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
                     'replydisc').
            '</span>';
 }
@@ -909,7 +858,7 @@ sub send_message_link {
                  &discussion_link($ressymb,
                     '<img alt="" class="LC_noBorder" src="'.
                     &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
-                    '" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
+                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
                     'sendmessageonly').
                  '</span>';
     return $output;
@@ -1003,9 +952,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>
@@ -1307,8 +1261,9 @@ sub build_posting_display {
                                 @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
                             }
 # Set up for sorting by last name, then first name
-                            my %names = &Apache::loncommon::getnames($contrib{$idx.':sendername'},
-                                                                     $contrib{$idx.':senderdomain'});
+                            my %names = &Apache::lonnet::get('environment',
+                                 ['firstname','lastname'],$contrib{$idx.':senderdomain'},
+                                  ,$contrib{$idx.':sendername'});
                             my $lastname = $names{'lastname'};
                             my $firstname = $names{'firstname'};
                             if ($lastname eq '') {
@@ -1818,11 +1773,14 @@ 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{'myqu'} = &mt('Post Discussion');
+  if($env{'form.editdisc'} || $env{'form.replydisc'}){
+    %lt = &Apache::lonlocal::texthash(
+            'myqu' => 'Post Discussion',
+    );
   }
   my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
@@ -2097,8 +2055,8 @@ END
     } else {
         $r->print(<<END);
 <p>
-$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" class="LC_flUpload" />
-<input type="hidden" id="LC_free_space" value="131072" />
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" class="flUpload" />
+<input type="hidden" id="free_space" value="131072" />
 </p>
 END
     }
@@ -2109,7 +2067,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
@@ -2745,46 +2703,29 @@ sub get_post_attachments {
         $$attachments{'0'}{'filename'} = $attachmenturls;
         $$attachments{'0'}{'0'} = 'n';
     }
+
     return;
 }
 
 sub fail_redirect {
-  my ($r,$feedurl,$delay) = @_;
+  my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   my %lt = &Apache::lonlocal::texthash(
                  'sorr' => 'Sorry, no recipients ...',
   );
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-  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(&Apache::loncommon::start_page('Feedback not sent',undef,
+					   {'redirect'  => [2,$feedurl],
+					    'only_body' => 1,}));
   $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,$delay) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
@@ -2883,20 +2824,10 @@ 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};
+      $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'};
   } else {
-      $parms{'redirect'}=[$delay,$feedurl];
+      $parms{'redirect'}=[0,$feedurl];
   }
   my $start_page=
       &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
@@ -2924,59 +2855,39 @@ ENDREDIR
 }
 
 sub no_redirect_back {
-  my ($r,$feedurl,$delay) = @_;
+  my ($r,$feedurl) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
-  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 %onload;
+
+  my %body_options = ('only_body'   => 1,
+		      'bgcolor'     => '#FFFFFF',
+		      'add_entries' => \%onload,);
+
+  if ($feedurl !~ m{^/adm/feedback}) { 
+      $body_options{'redirect'} = [2,$feedurl];
   }
   my $start_page=
       &Apache::loncommon::start_page('Feedback not sent',undef,
-				     \%parms);
-
+				     \%body_options);
+				      
   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 %default = &Apache::lonlocal::texthash (
-                    question => 'Question about resource content',
-                    comment => 'Question/Comment/Feedback about course content',
-                    policy => 'Question/Comment/Feedback about course policy',
-                  );
+    my $crscontent = &mt('Question/Comment/Feedback about course content');
+    my $crspolicy = &mt('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');
@@ -2984,8 +2895,8 @@ sub screen_header {
     if ($env{'request.course.id'}) {
         $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');
+            $crscontent = &mt('Question/Comment/Feedback about community content');
+            $crspolicy = &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');
@@ -2993,76 +2904,58 @@ 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'})) {
-            $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 (($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 (($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')))) {
-            $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);
+                            '</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);
+            }
         }
     }
     if ($msgoptions) {
@@ -3150,17 +3043,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'); }
@@ -3174,8 +3059,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++;
@@ -3183,24 +3067,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:
@@ -3218,7 +3084,7 @@ sub send_msg {
 	    }
         }
     }
-    return ($status,$sendsomething,$delay);
+    return ($status,$sendsomething);
 }
 
 # Routine to get the complete feedback records
@@ -3308,7 +3174,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'} = '';
@@ -3642,7 +3508,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
 
@@ -3685,8 +3551,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="LC_flUpload" />'
-        .'<input type="hidden" id="LC_free_space" value="131072" />'
+    $r->print('<input type="file" name="addnewattach" class="flUpload" />'
+        .'<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)){
@@ -4029,9 +3895,8 @@ 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;
       }
   } 
@@ -4238,7 +4103,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;
       }
 
@@ -4670,12 +4535,6 @@ 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 (
 	  (
@@ -4685,14 +4544,12 @@ 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,2);
+	  &no_redirect_back($r,$feedurl);
 	  return OK;
       }
 # --------------------------------------------------- Print login screen header
@@ -4712,7 +4569,7 @@ ENDREDIR
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
-	      &fail_redirect($r,$feedurl,2);
+	      &fail_redirect($r,$feedurl);
 	  }
 	  return OK;
       }
@@ -4778,10 +4635,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;
@@ -4789,7 +4645,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++;
@@ -4812,8 +4672,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);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group,$toolarge);
   }
   return OK;
 }