--- loncom/interface/lonfeedback.pm	2010/08/25 00:46:37	1.300
+++ loncom/interface/lonfeedback.pm	2011/12/12 00:13:43	1.310
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.300 2010/08/25 00:46:37 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.310 2011/12/12 00:13:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,7 +135,7 @@ sub list_discussion {
     $crs=~s/\_/\//g;
     my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
-		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
+		  && ($ressymb=~/$LONCAPA::assess_re/));
     
     my %usernamesort = ();
     my %namesort =();
@@ -281,13 +281,12 @@ sub list_discussion {
     my $maxdepth=0;
     my %anonhash=();
     my $anoncnt=0;
-    my $target='';
 
     my $now = time;
     $discinfo{$visitkey} = $visit;
 
     &Apache::lonnet::put('nohist_'.$cid.'_discuss',\%discinfo,$env{'user.domain'},$env{'user.name'});
-    &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
+    &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,\@grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,\%anonhash,$anoncnt,$group);
 
     my $discussion='';
     my $manifestfile;
@@ -724,7 +723,8 @@ END
         }
 	if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
             if (($group ne '') && ($mode eq 'board')) {  
-                if (&check_group_priv($group,'pgd') eq 'ok') {
+                if ((&check_group_priv($group,'pgd') eq 'ok') && 
+                   ($ressymb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$})) {
                     $discussion .=
 			&postingform_display($mode,$ressymb,$now,$subject,
 					     $comment,$outputtarget,$attachnum,
@@ -732,19 +732,30 @@ END
 					     $group,$crstype);
                 }
             } else {
-	        $discussion.= 
-		    &postingform_display($mode,$ressymb,$now,$subject,
-					 $comment,$outputtarget,$attachnum,
-					 $currnewattach,$currdelold,'',$crstype);
+                if (&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+                    ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+
+	            $discussion.= 
+		        &postingform_display($mode,$ressymb,$now,$subject,
+					     $comment,$outputtarget,$attachnum,
+					     $currnewattach,$currdelold,'',$crstype);
+                } else {
+                    $discussion.= '<span class="LC_feedback_link">'.
+                                  &mt('This discussion is closed.').'</span>';
+                }
             }
 	}
+        if (!(&discussion_open($status)) && ($outputtarget ne 'tex')) {
+            $discussion.= '<span class="LC_feedback_link">'.
+                          &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,$target);
+            $discussion.= &send_feedback_link($ressymb);
             if ($env{'request.role.adv'}) {
                 my $close = &Apache::lonnet::EXT('resource.0.discussend',$ressymb);
                 if (defined($close) && $close ne '' && $close < time) {
@@ -760,15 +771,25 @@ END
     return $discussion;
 }
 
+
+sub discussion_link {
+   my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds)=@_;
+   my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
+   if ($flag) { $link .= '&amp;previous='.$prev; }
+   if ($adds) { $link .= $adds; }
+   return &Apache::loncommon::modal_link($link,$linktext,600,600);
+}
+
+
 sub send_feedback_link {
-    my ($ressymb,$target) = @_;
-    my $output = '<span class="LC_feedback_link">'.
-                 ' <a href="/adm/feedback?replydisc='.
-                 &escape($ressymb).':::" '.$target.'>'.
-                 '<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></a></span>';
-    return $output;
+    my ($ressymb) = @_;
+    return '<span class="LC_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>',
+                    'replydisc').
+           '</span>';
 }
 
 sub send_message_link {
@@ -850,6 +871,11 @@ sub postingform_display {
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
         $postingform = &Apache::lonhtmlcommon::htmlareaselectactive();
         $textareaclass = 'class="LC_richDefaultOff"';
+        if ($env{'request.course.id'}) {
+            unless (($env{'course.'.$env{'request.course.id'}.'.allow_limited_html_in_feedback'} =~ /^\s*yes\s*$/i) || ($env{'form.sendmessageonly'})) {
+                undef($textareaclass);
+            }
+        }
     }
     $postingform .= (<<ENDDISCUSS);
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
@@ -905,7 +931,7 @@ ENDDISCUSS
 }
 
 sub build_posting_display {
-    my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
+    my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_;
     my @original=();
     my @index=();
     my $skip_group_check = 0;
@@ -1078,14 +1104,8 @@ sub build_posting_display {
                             if ($outputtarget ne 'tex') {
                                 if (&editing_allowed($escsymb.':::'.$idx,$group)) {
                                     if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
-                                        $sender.=' <a href="/adm/feedback?editdisc='.
-                                             $escsymb.':::'.$idx;
-                                        if ($$newpostsflag) {
-                                            $sender .= '&amp;previous='.$prevread;
-                                        }
-				        $sender .= &group_args($group);
-                                        $sender .= '" '.$target.'>'.&mt('Edit').'</a>';
-                                    
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         unless ($seeid) {
                                             my $grpargs = &group_args($group);
                                             $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
@@ -1096,21 +1116,12 @@ sub build_posting_display {
 			        if ($seeid) {
 			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
-			                    $sender.=' <a href="/adm/feedback?unhide='.
-				                     $escsymb.':::'.$idx;
-                                            if ($$newpostsflag) {
-                                                $sender .= '&amp;previous='.$prevread;
-                                            }
-                                            $sender .= '">'.&mt('Make Visible').'</a>';
+ 		                           $sender.=' '.
+                                            &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         }
 			            } else {
-				        $sender.=' <a href="/adm/feedback?hide='.
-				                 $escsymb.':::'.$idx;
-                                        if ($$newpostsflag) {
-                                            $sender .= '&amp;previous='.$prevread;
-                                        }
-				        $sender .= &group_args($group);
-                                        $sender .= '">'.&mt('Hide').'</a>';
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
 			            }
                                     my $grpargs = &group_args($group);
 			            $sender.= 
@@ -1148,23 +1159,14 @@ sub build_posting_display {
 		            if (&discussion_open($status)) {
                                 if (($group ne '') && 
                                     (&check_group_priv($group,'pgd') eq 'ok')) {
-                                     $sender.=' <a href="/adm/feedback?replydisc='.
-                                              $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-                                    $sender .= &group_args($group);
-                                    $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
+                                     $sender.=' '.
+                                         &discussion_link($symb,&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.=' <a href="/adm/feedback?replydisc='.
-			                      $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-                                    $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
+			             $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
                                 }
                             }
 		            if ($viewgrades) {
@@ -1295,9 +1297,8 @@ sub build_posting_display {
                                 my @postversions = ();
                                 $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
                                 if ($seeid) {
-                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;<a href="/adm/feedback?allversions='.$escsymb.':::'.$idx;
-				    $$discussionitems[$idx] .= &group_args($group);
-                                    $$discussionitems[$idx] .= '">'.&mt('Display all versions').'</a>';
+                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
+                                         &discussion_link($symb,&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/:/) {
@@ -1699,6 +1700,11 @@ END
   if (&Apache::lonhtmlcommon::htmlareabrowser()) {
       $textareaheader = &Apache::lonhtmlcommon::htmlareaselectactive();
       $textareaclass = 'class="LC_richDefaultOff"';
+      if ($env{'request.course.id'}) {
+          unless (($env{'course.'.$env{'request.course.id'}.'.allow_limited_html_in_feedback'} =~ /^\s*yes\s*$/i) || ($env{'form.sendmessageonly'})) {
+              undef($textareaclass);
+          }
+      }
   }
 
   # Breadcrumbs
@@ -1706,10 +1712,10 @@ END
                  'text' => 'Resource Feedback and Discussion'}];
 
   my %onload = ('onload' => 'window.focus();setposttype();');
+  my %parms=('add_entries' => \%onload);
+  if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
   my $start_page=
-      &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,
-                                     {'add_entries' => \%onload,
-                                      'bread_crumbs' => $brcrum,});
+      &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms);
 
   if ($quote ne '') {
       $quote = &HTML::Entities::decode($quote);
@@ -1718,14 +1724,18 @@ END
       }
       $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>';
   }
-
+  my $header='';
+  unless ($env{'form.modal'}) {
+     $header="<h2><tt>$restitle</tt></h2>";
+  }
   $r->print(<<END);
 $start_page
-<h2><tt>$restitle</tt></h2>
+$header
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
 $prevtag
 <input type="hidden" name="postdata" value="$feedurl" />
+<input type="hidden" name="modal" value="$env{'form.modal'}" />
 END
   if ($env{'form.replydisc'}) {
       $r->print(<<END);
@@ -1738,7 +1748,7 @@ END
 END
   }
   $r->print(<<END);
-$options<hr />
+$options
 $quote
 <p>$lt{'myqu'}
 $textareaheader
@@ -2275,7 +2285,7 @@ sub print_showposters {
     my $group = $env{'form.group'};
     my $ressymb = &wrap_symb($symb);
     if (($group ne '') &&
-        ($ressymb =~ m|^bulletin___ \d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
+        ($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|)) {
         if (&check_group_priv($group,'dgp') eq 'ok') {
             $seeid = 1;
         }
@@ -2548,12 +2558,14 @@ sub redirect_back {
   } 
   &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
-  my %onload;
+  my %parms=('only_body'   => 1);
+  if ($env{'form.modal'}) {
+      $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'};
+  } else {
+      $parms{'redirect'}=[0,$feedurl];
+  }
   my $start_page=
-      &Apache::loncommon::start_page('Feedback sent',undef,
-				     {'redirect'    => [0,$feedurl],
-				      'only_body'   => 1,
-				      'add_entries' => \%onload});
+      &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
   my $end_page = &Apache::loncommon::end_page();
   $r->print(<<ENDREDIR);
 $start_page
@@ -2608,7 +2620,7 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-    my ($feedurl,$symb) = @_;
+    my ($feedurl,$symb,$group) = @_;
     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');
@@ -2657,10 +2669,19 @@ sub screen_header {
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
         my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
-        if (!$blocked && &discussion_open(undef,$symb) && 
-	    &Apache::lonnet::allowed('pch',
-				     $env{'request.course.id'}.
-				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $realsymb = $symb;
+        if ($symb=~/^bulletin___/) {
+            my $filename=(&Apache::lonnet::decode_symb($symb))[2];
+            $filename=~s|^adm/wrapper/||;
+            $realsymb=&Apache::lonnet::symbread($filename);
+        }
+        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" /> '.
@@ -2674,16 +2695,16 @@ sub screen_header {
         }
     }
     if ($msgoptions) {
-        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
-                   .' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>'
-                   .$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>'.
+                   '<td>'.$msgoptions.'</td></tr>';
     }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />'
-                        .' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>'
-                        .$discussoptions;
+	$discussoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />'
+                        .'<br />'.&mt('Discussion Contributions').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</th>'.
+                        '<td>'.$discussoptions.'</td></tr>';
     }
-    return $msgoptions.$discussoptions;
+    return  &Apache::loncommon::start_data_table().$msgoptions.$discussoptions.&Apache::loncommon::end_data_table();
 }
 
 sub resource_output {
@@ -2799,7 +2820,7 @@ sub send_msg {
 }
 
 sub adddiscuss {
-    my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
+    my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_;
     my $status='';
     my $realsymb;
     if ($symb=~/^bulletin___/) {
@@ -2807,9 +2828,16 @@ sub adddiscuss {
 	$filename=~s|^adm/wrapper/||;
 	$realsymb=&Apache::lonnet::symbread($filename);
     }
+    my ($cnum,$cdom);
+    if ($env{'request.course.id'}) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }
     if (&discussion_open(undef,$realsymb) &&
-	&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
-        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
+	(&Apache::lonnet::allowed('pch',$env{'request.course.id'}.
+         ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || 
+         (($group ne '') && (&check_group_priv($group,'pgd') eq 'ok') && 
+         ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$})))) {
 
     my %contrib=('message'      => $email,
                  'sendername'   => $env{'user.name'},
@@ -3067,9 +3095,11 @@ END
     # Breadcrumbs
     my $brcrum = [{'href' => '',
                    'text' => 'Discussion Post Attachments'}];
+    my %parms=();
+    if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+
     my $start_page = 
-	&Apache::loncommon::start_page('Discussion Post Attachments',$js,
-                                   {'bread_crumbs' => $brcrum,});
+	&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms);
 
     my $orig_subject = &unescape($env{'form.subject'});
     my $subject=&clear_out_html($orig_subject);
@@ -3430,7 +3460,7 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
+         ['modal','hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
   my $group = $env{'form.group'};
   my %attachmax = (
                     text => &mt('(128 KB max size)'),
@@ -3481,10 +3511,11 @@ sub handler {
       # Breadcrumbs
       my $brcrum = [{'href' => '',
                      'text' => 'Discussion Post Versions'}];
+      
+      my %parms=();
+      if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
 
-      $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,
-                                               {'bread_crumbs' => $brcrum,})
-      );
+      $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms));
 
       my $crs='/'.$env{'request.course.id'};
       if ($env{'request.course.sec'}) {
@@ -3776,7 +3807,7 @@ ENDREDIR
       my $mode='board';
       my $status='OPEN';
       my $previous=$env{'form.previous'};
-      if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+      if ($feedurl =~ /$LONCAPA::assess_re/) {
           $mode='problem';
           $status=$Apache::inputtags::status[-1];
       }
@@ -3816,7 +3847,7 @@ ENDREDIR
           &dewrapper(\$feedurl);
       }
       my $goahead=1;
-      if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
+      if ($feedurl=~/$LONCAPA::assess_re/) {
 	  unless ($symb) { $goahead=0; }
       }
       if (!$goahead) {
@@ -3854,7 +3885,7 @@ ENDREDIR
                   return OK;
               }
           }
-	  my $options=&screen_header($feedurl,$symb);
+	  my $options=&screen_header($feedurl,$symb,$group);
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
 	  } else {
@@ -3910,7 +3941,11 @@ ENDREDIR
           }
       }
 # Filter HTML out of message (could be nasty)
-      my $message=&clear_out_html($env{'form.comment'});
+      my $override;
+      if ($env{'form.discuss'} =~ /^(?:author|question|course|policy)$/) {
+          $override = 1;
+      }
+      my $message=&clear_out_html($env{'form.comment'},$override);
 
 # Assemble email
       my ($email,$citations)=&assemble_email($message,$prevattempts,
@@ -3932,7 +3967,7 @@ ENDREDIR
 	  my $subject = &clear_out_html($env{'form.subject'});
 	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
-				  $subject);
+				  $subject,$group);
 	  $numpost++;
       }