--- loncom/interface/lonfeedback.pm	2006/11/29 19:31:48	1.223
+++ loncom/interface/lonfeedback.pm	2007/01/05 06:47:22	1.240
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.223 2006/11/29 19:31:48 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.240 2007/01/05 06:47:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,6 @@ use HTML::LCParser();
 use Apache::lonspeller();
 use Apache::longroup;
 use Cwd;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 
 sub discussion_open {
@@ -75,6 +74,9 @@ sub discussion_visible {
 
 sub list_discussion {
     my ($mode,$status,$ressymb,$imsextras,$group)=@_;
+    unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
+    unless ($ressymb) { return ''; }
+    $ressymb=&wrap_symb($ressymb);
     my $outputtarget=$env{'form.grade_target'};
     if (defined($env{'form.export'})) {
 	if($env{'form.export'}) {
@@ -86,16 +88,26 @@ sub list_discussion {
             $outputtarget = 'export';
         }
     }
-    if (not &discussion_visible($status)) { return ''; }
+    if (not &discussion_visible($status)) {
+        if ($mode ne 'board') {
+            &Apache::lonenc::check_encrypt(\$ressymb); 
+            return &send_message_link($ressymb);
+        }
+    }
     if ($group ne '' && $mode eq 'board') {
         if (&check_group_priv($group,'vgb') ne 'ok') {
             return '';
         }
     }
 
-    my ($blocked,$blocktext) = &blocking_posts('boards',1);
+    my ($blocked,$blocktext) = 
+        &Apache::loncommon::blocking_status('boards');
     if ($blocked) {
-        return $blocktext;
+        &Apache::lonenc::check_encrypt(\$ressymb);
+        if ($mode ne 'board') {
+            $blocktext.='<br />'.&send_message_link($ressymb);
+        }
+        return $blocktext; 
     }
 
     my @bgcols = ("#cccccc","#eeeeee");
@@ -108,9 +120,6 @@ sub list_discussion {
 	$crs.='_'.$env{'request.course.sec'};
     }
     $crs=~s/\_/\//g;
-    unless ($ressymb) {	$ressymb=&Apache::lonnet::symbread(); }
-    unless ($ressymb) { return ''; }
-    $ressymb=&wrap_symb($ressymb);
     my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
 		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
@@ -723,26 +732,45 @@ END
             }
 	}
     } else {
-	$discussion.='<table bgcolor="#BBBBBB"><tr><td>';
+        $discussion.='<table class="LC_feedback_link"><tr><td>';
         if (&discussion_open($status) &&
             &Apache::lonnet::allowed('pch',
     	        $env{'request.course.id'}.
 	        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
-		$discussion.='<a href="/adm/feedback?replydisc='.
-		    &escape($ressymb).':::" '.$target.'>'.
-		    '<img alt="" src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
-		    &mt('Post Discussion').'</a><br />';
+		$discussion.= &send_feedback_link($ressymb,$target).
+                              '<br />';
             }
 	}
-	$discussion.='<a href="/adm/feedback?sendmessageonly=1&amp;symb='.
-	    &escape($ressymb).
-	    '"><img alt="" src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
-		    &mt('Send Message').'</a></td></tr></table>';
+        if ($outputtarget ne 'tex') {
+	    $discussion.= &send_message_link($ressymb);
+        }
+        $discussion.='</td></tr></table>';
     }
     return $discussion;
 }
 
+sub send_feedback_link {
+    my ($ressymb,$target) = @_;
+    my $output = '<span class="LC_feedback_link">'.
+                 ' <a href="/adm/feedback?replydisc='.
+                 &escape($ressymb).':::" '.$target.'>'.
+                 '<img alt="" src="'.
+                 &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
+                 '" border="0" />'.&mt('Post Discussion').'</a></span>';
+    return $output;
+}
+
+sub send_message_link {
+    my ($ressymb) = @_;
+    my $output = '<span class="LC_feedback_link">'.
+                 '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
+                 &escape($ressymb).'"><img alt="" src="'.
+                 &Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').
+                 '" border="0" />'.&mt('Send Message').'</a></span>';
+    return $output;
+}
+
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
     my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
@@ -796,25 +824,6 @@ sub action_links_bar {
     return $discussion;
 }
 
-sub blocking_posts {
-    my ($type,$showstatus) = @_;
-    my %setters;
-    my ($blocked,$output);
-    my ($startblock,$endblock) =
-          &Apache::loncommon::blockcheck(\%setters,$type);
-    if ($startblock && $endblock) {
-        $blocked = 1;
-        if ($showstatus) {
-            my $showstart = &Apache::lonlocal::locallocaltime($startblock);
-            my $showend = &Apache::lonlocal::locallocaltime($endblock);
-            $output = &mt('Discussion postings will not be viewable for resources in this course between [_1] and [_2] because communication is being blocked.',$showstart, $showend).'<br />'.
-                    &Apache::loncommon::build_block_table($startblock,$endblock,
-                                                         \%setters);
-        }
-    }
-    return ($blocked,$output);
-}
-
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
         $currnewattach,$currdelold,$group) = @_;
@@ -851,11 +860,16 @@ ENDDISCUSS
     if ($group ne '') {
         $postingform .='<input type="hidden" name="group" value="'.$group.'" />';
     }
+    my $blockblog = &Apache::loncommon::blocking_status('blogs');
+    if (!$blockblog) {
+        $postingform .= &add_blog_checkbox();
+    }
     $postingform .= "</form>\n";
     if ($outputtarget ne 'tex') {
         $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
                                                      $now,$currnewattach,
-                                                     $currdelold,'',$mode);
+                                                     $currdelold,'',$mode,
+                                                     $blockblog);
         if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
             $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
             if (@{$currnewattach} > 1) {
@@ -1454,7 +1468,7 @@ sub replicate_attachments {
 }
 
 sub mail_screen {
-  my ($r,$feedurl,$options) = @_;
+  my ($r,$feedurl,$options,$caller_symb) = @_;
   if (exists($env{'form.origpage'})) {
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']);
   }
@@ -1465,9 +1479,8 @@ sub mail_screen {
             'title' => 'Title',
             'reta' => 'Retained attachments',
             'atta' => 'Attachment (128 KB max size)',
-           ); 
-  my $title=&Apache::lonnet::gettitle($feedurl);
-  if (!$title) { $title = $feedurl; }
+           );
+  my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
   my $subject = '';
   my $comment = '';
@@ -1556,7 +1569,7 @@ END
               if ($idx > 0) {
                   my %subversions = ();
                   &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
-                  $subject = &mt('Re: ')..$subversions{$numoldver};
+                  $subject = &mt('Re: ').$subversions{$numoldver};
               }
               $subject = &HTML::Entities::encode($subject,'<>&"');
           } else {
@@ -1655,7 +1668,7 @@ END
 
   $r->print(<<END);
 $start_page
-<h2><tt>$title</tt></h2>
+<h2><tt>$restitle</tt></h2>
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
 $prevtag
@@ -1724,6 +1737,7 @@ END
     if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
         my $now = time;
         my $ressymb = $symb;
+        &Apache::lonenc::check_encrypt(\$ressymb);
         my $postidx = '';
         if ($env{'form.editdisc'}) {
             $postidx = $idx;
@@ -1731,7 +1745,8 @@ END
         if (@currnewattach > 0) {
             $attachnum += @currnewattach;
         }
-        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
+        my $blockblog = &Apache::loncommon::blocking_status('blogs');
+        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
         if ($attachnum > 0) {
             if (@currnewattach > 0) {
                 $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
@@ -2466,7 +2481,7 @@ sub redirect_back {
           $feedurl .= '?group='.$group.$refarg;
       }
   } 
-  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %onload;
   if ($env{'environment.remote'} ne 'off') {
@@ -2523,7 +2538,7 @@ sub no_redirect_back {
 				      
   my $end_page = &Apache::loncommon::end_page();
 
-  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
 $start_page
@@ -2567,20 +2582,16 @@ sub screen_header {
 	    &Apache::lonnet::allowed('pch',
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
-            my ($blocked) = &blocking_posts('boards');
-            if (!$blocked) {
-	        $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
-		    &mt('Contribution to course discussion of resource');
+	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
+		&mt('Contribution to course discussion of resource');
 	        $discussoptions.='</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-		    &mt('Anonymous contribution to course discussion of resource').
-		    ' <i>('.&mt('name only visible to course faculty').')</i></label> '.
-		    '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
-            }
+		&mt('Anonymous contribution to course discussion of resource').
+		' <i>('.&mt('name only visible to course faculty').')</i></label> '.
+		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
         }
-        my ($blockblog) = &blocking_posts('blogs');
+        my $blockblog = &Apache::loncommon::blocking_status('blogs');
         if (!$blockblog) {
-            $discussoptions.='<br /><label><input type="checkbox" name="blog" /> '.
-	        &mt('Add to my public course blog').'</label>';
+            $discussoptions.= &add_blog_checkbox();
         }
     }
     if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
@@ -2629,7 +2640,7 @@ sub clear_out_html {
 }
 
 sub assemble_email {
-  my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
+  my ($message,$prevattempts,$usersaw,$useranswer)=@_;
   my %lt = &Apache::lonlocal::texthash(
              'prev' => 'Previous attempts of student (if applicable)',
              'orig' => 'Original screen output (if applicable)',
@@ -2655,13 +2666,18 @@ sub secapply {
     my $defaultflag=shift;
     $rec=~s/\s+//g;
     $rec=~s/\@/\:/g;
-    my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
-    if ($sections) {
-	foreach my $sec (split(/\;/,$sections)) {
-            if (($sec eq $env{'request.course.sec'}) ||
-                ($defaultflag && ($sec eq '*'))) {
+    my ($adr,$sections_or_groups)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
+    if ($sections_or_groups) {
+	foreach my $item (split(/\;/,$sections_or_groups)) {
+            if (($item eq $env{'request.course.sec'}) ||
+                ($defaultflag && ($item eq '*'))) {
                 return $adr; 
-            }
+            } elsif ($env{'request.course.groups'}) {
+                my @usersgroups = split(/:/,$env{'request.course.groups'});
+                if (grep(/^\Q$item\E$/,@usersgroups)) {
+                    return $adr;
+                }
+            } 
         }
     } else {
        return $rec;
@@ -2702,11 +2718,12 @@ Returns
 
 sub decide_receiver {
   my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
+  &Apache::lonenc::check_decrypt(\$feedurl);
   my $typestyle='';
   my %to=();
   if ($env{'form.discuss'} eq 'author' ||$author) {
     $typestyle.='Submitting as Author Feedback<br />';
-    $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
+    $feedurl=~ m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/};
     $to{$2.':'.$1}=1;
   }
   if ($env{'form.discuss'} eq 'question' ||$question) {
@@ -2750,17 +2767,17 @@ sub feedback_available {
 }
 
 sub send_msg {
-  my ($title,$feedurl,$email,$citations,$attachmenturl,%to)=@_;
+  my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
   my $status='';
   my $sendsomething=0;
+  my $restitle = &get_resource_title($symb,$feedurl);
   if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
   unless ($title=~/\w/) { $title=&mt('Feedback'); }
   foreach my $key (keys(%to)) {
     if ($key) {
-      my $declutter=&Apache::lonnet::declutter($feedurl);
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$key),
-               $title.' ['.$declutter.']',$email,$citations,$feedurl,
-                $attachmenturl)=~/ok/) {
+               $title.' ['.$restitle.']',$email,$citations,$feedurl,
+                $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
 	$status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
       } else {
 	$sendsomething++;
@@ -2812,10 +2829,11 @@ sub adddiscuss {
 	$contrib{'anonymous'}='true';
     }
     if (($symb) && ($email)) {
+        my $now = time;
         if ($env{'form.editdisc'}) {
             $contrib{'ip'}=$ENV{'REMOTE_ADDR'};
             $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'};
-            $contrib{'timestamp'} = time;
+            $contrib{'timestamp'} = $now;
             $contrib{'history'} = '';
             my $numoldver = 0;
             my ($oldsymb,$oldidx)=split(/\:\:\:/,$env{'form.editdisc'});
@@ -2866,7 +2884,7 @@ sub adddiscuss {
                      $env{'course.'.$env{'request.course.id'}.'.domain'},
 		     $env{'course.'.$env{'request.course.id'}.'.num'});
         }
-        my %storenewentry=($symb => time);
+        my %storenewentry=($symb => $now);
         $status.='<br />'.&mt('Updating discussion time').': '.
         &Apache::lonnet::put('discussiontimes',\%storenewentry,
                      $env{'course.'.$env{'request.course.id'}.'.domain'},
@@ -2887,6 +2905,48 @@ sub adddiscuss {
     return $status.'<br />';   
 }
 
+sub get_discussion_info {
+    my ($idx,%contrib) = @_;
+    my $changelast = 0;
+    my $count = 0;
+    my $hiddenflag = 0;
+    my $deletedflag = 0;
+    my ($hidden,$deleted,%info,$newlastdisc);
+    my $version = $contrib{'version'};
+    if ($version) {
+        for (my $id=$version; $id>0; $id--) {
+            my $vkeys=$contrib{$id.':keys'};
+            my @keys=split(/:/,$vkeys);
+            if (grep(/^hidden$/,@keys)) {
+                if (!$hiddenflag) {
+                    $hidden = $contrib{$id.':hidden'};
+                    $hiddenflag = 1;
+                }
+            } elsif (grep(/^deleted$/,@keys)) {
+                if (!$deletedflag) {
+                    $deleted = $contrib{$id.':deleted'};
+                    $deletedflag = 1;
+                }
+            } else {
+                if (($hidden !~/\.$id\./) && ($deleted !~/\.$id\./)) {
+                    $count++;
+                    $info{$count}{'id'} = $id;
+                    $info{$count}{'timestamp'}=$contrib{$id.':timestamp'}; 
+                }
+            }
+        }
+        if ($info{'1'}{'id'} == $idx) {
+            $changelast = 1;
+            if ($count > 1) { 
+                $newlastdisc =  $info{'2'}{'timestamp'};
+            } else {
+                $newlastdisc = 0;
+            }
+        }
+    }
+    return ($changelast,$newlastdisc);
+}
+
 # ----------------------------------------------------------- Preview function
 
 sub show_preview {
@@ -3078,7 +3138,8 @@ sub process_attachments {
 }
 
 sub generate_attachments_button {
-    my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,$numoldver,$mode) = @_;
+    my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,
+        $numoldver,$mode,$blockblog) = @_;
     my $origpage = $ENV{'REQUEST_URI'};
     my $att=$attachnum.' '.&mt("attachments");
     my %lt = &Apache::lonlocal::texthash(
@@ -3090,6 +3151,9 @@ sub generate_attachments_button {
 $lt{'clic'}:&nbsp;<input type="button" value="$att"
 onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
 END
+    if (!$blockblog) {
+        $response .= 'setblogvalue();';
+    }
     unless ($mode eq 'board') {
         $response .= 'javascript:anonchk();';
     }
@@ -3229,6 +3293,26 @@ sub construct_attachmenturl {
     return $newattachmenturl; 
 }
 
+sub add_blog_checkbox {
+    my ($checkstatus);
+    if ($env{'form.blog'}) {
+        $checkstatus = 'checked="checked"';
+    }
+    my $output = '
+<script type="text/javascript">
+function setblogvalue() {
+    if (document.mailform.blog.checked) {
+        document.attachment.blog.value = 1;
+    } else {
+        document.attachment.blog.value = 0;
+    }
+}
+</script><br />
+<label><input type="checkbox" name="blog" '.$checkstatus.' /> '.
+&mt('Add to my public course blog').'</label><br />'."\n";
+    return $output;
+}
+
 sub has_discussion {
     my $resourcesref = shift;
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -3531,7 +3615,16 @@ ENDREDIR
       if ( ($env{'form.hide'}) && (!$seeid) ) {
 	  $newhash{'studenthidden'} = $currentstudenthidden;
       }
-
+      if ($env{'form.hide'}) {
+          my $changelast = 0;
+          my $newlast;
+          ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
+          if ($changelast) {
+              &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
+                     $env{'course.'.$env{'request.course.id'}.'.domain'},
+                     $env{'course.'.$env{'request.course.id'}.'.num'});
+          }
+      }
       &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
                            $env{'course.'.$env{'request.course.id'}.'.domain'},
 			   $env{'course.'.$env{'request.course.id'}.'.num'});
@@ -3560,6 +3653,11 @@ ENDREDIR
       my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
                           $env{'course.'.$env{'request.course.id'}.'.domain'},
 		          $env{'course.'.$env{'request.course.id'}.'.num'});
+      my ($changelast,$newlast) = &get_discussion_info($idx,%contrib);
+      if ($changelast) {
+          &Apache::lonnet::put('discussiontimes',{$symb => $newlast},
+                   $env{'course.'.$env{'request.course.id'}.'.domain'},                   $env{'course.'.$env{'request.course.id'}.'.num'});
+      }
       my %newhash=('deleted' => $contrib{'deleted'}.".$idx.");
       &Apache::lonnet::store(\%newhash,$symb,$env{'request.course.id'},
 			   $env{'course.'.$env{'request.course.id'}.'.domain'},
@@ -3627,12 +3725,8 @@ ENDREDIR
       my $symb;
       if ($env{'form.replydisc'}) {
 	  $symb=(split(/\:\:\:/,$env{'form.replydisc'}))[0];
-	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	  $feedurl=&Apache::lonnet::clutter($url);
       } elsif ($env{'form.editdisc'}) {
 	  $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
-	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	  $feedurl=&Apache::lonnet::clutter($url);
       } elsif ($env{'form.origpage'}) {
 	  $symb=""; 
       } else {
@@ -3640,18 +3734,18 @@ ENDREDIR
       }
       unless ($symb) {
 	  $symb=$env{'form.symb'};
-	  if ($symb) {
-	      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	      $feedurl=&Apache::lonnet::clutter($url);
-	  }
       }
-      &Apache::lonenc::check_decrypt(\$symb);
+      if (defined($symb)) {
+          ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);
+      } else {
+          # backward compatibility (bulletin boards used to be 'wrapped')
+          &Apache::lonenc::check_decrypt(\$feedurl);
+          &dewrapper(\$feedurl);
+      }
       my $goahead=1;
       if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
 	  unless ($symb) { $goahead=0; }
       }
-      # backward compatibility (bulletin boards used to be 'wrapped')
-      &dewrapper(\$feedurl);
       if (!$goahead) {
           # Ambiguous Problem Resource
 	  $r->internal_redirect('/adm/ambiguous');
@@ -3670,16 +3764,26 @@ ENDREDIR
 	  &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);
 	  return OK;
       }
 # --------------------------------------------------- Print login screen header
       unless ($env{'form.sendit'}) {
+          &Apache::lonenc::check_encrypt(\$feedurl);
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
+          if (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
+              my ($blocked,$blocktext) = 
+                     &Apache::loncommon::blocking_status('boards');
+              if ($blocked) {
+                  $r->print(&blocked_reply_or_edit($blocktext));
+                  return OK;
+              }
+          }
 	  my $options=&screen_header($feedurl,$symb);
 	  if ($options) {
-	      &mail_screen($r,$feedurl,$options);
+	      &mail_screen($r,$feedurl,$options,$symb);
 	  } else {
 	      &fail_redirect($r,$feedurl);
 	  }
@@ -3692,13 +3796,16 @@ ENDREDIR
 				   $env{'request.course.id'});
 
 # Get output from resource
+      &Apache::lonenc::check_encrypt(\$feedurl);
       my $usersaw=&resource_output($feedurl);
 
 # Get resource answer (need to allow student to view grades for this to work)
       &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
-      my $useranswer=&Apache::loncommon::get_student_answers(
-                                   $symb,$env{'user.name'},$env{'user.domain'},
-		                   $env{'request.course.id'});
+      my $usersymb = &Apache::lonenc::check_encrypt($symb);
+      my $useranswer=
+          &Apache::loncommon::get_student_answers(
+              $usersymb,$env{'user.name'},$env{'user.domain'},
+              $env{'request.course.id'});
       &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
       my $attachmenturl='';
@@ -3728,7 +3835,7 @@ ENDREDIR
       my $message=&clear_out_html($env{'form.comment'});
 
 # Assemble email
-      my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
+      my ($email,$citations)=&assemble_email($message,$prevattempts,
 					     $usersaw,$useranswer);
  
 # Who gets this?
@@ -3738,7 +3845,7 @@ ENDREDIR
       my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'},
 						      undef,1),
 				      $feedurl,$email,$citations,
-				      $attachmenturl,%to);
+				      $attachmenturl,$usersymb,%to);
 
 # Discussion? Store that.
       my $numpost=0;
@@ -3768,6 +3875,15 @@ ENDREDIR
       &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group);
   }
   return OK;
+}
+
+sub blocked_reply_or_edit {
+    my ($blocktext) = @_;
+    return 
+      &Apache::loncommon::start_page('Resource Feedback and Discussion').
+      $blocktext.'<br /><br /><a href="javascript:history.go(-1)">'.
+      &mt('Back to previous page').
+      &Apache::loncommon::end_page();
 } 
 
 sub wrap_symb {
@@ -3872,5 +3988,32 @@ sub group_args {
     return $extra_args;
 }
 
+sub get_resource_title {
+    my ($symb,$feedurl) = @_;
+    my ($restitle,$plainurl);
+    if (defined($symb)) {
+        my $plain_symb = &Apache::lonenc::check_decrypt($symb);
+        $restitle = &Apache::lonnet::gettitle($plain_symb);
+    }
+    if (defined($feedurl)) {
+        $plainurl = &Apache::lonenc::check_decrypt($feedurl);
+    }
+    if (!defined($restitle)) {
+        if (defined($feedurl)) {
+            $restitle = &Apache::lonnet::gettitle($plainurl);
+        }
+    }
+    if ($plainurl ne $feedurl) {
+        my ($plain_filename) = ($plainurl =~ m-/([^/]+)$-);
+        if ($plain_filename eq $restitle) {
+            $restitle = &mt('Untitled resource');
+        }
+    }
+    if ($restitle eq '') {
+        $restitle = &mt('Untitled resource');
+    }
+    return $restitle;
+}
+
 1;
 __END__