--- loncom/interface/lonfeedback.pm	2010/08/07 19:23:50	1.297
+++ loncom/interface/lonfeedback.pm	2011/12/10 22:54:34	1.307
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.297 2010/08/07 19:23:50 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.307 2011/12/10 22:54:34 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;
@@ -722,9 +721,10 @@ END
                 $attachnum += @{$currnewattach};
             }
         }
-	if (&discussion_open($status)) {
+	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,43 +732,64 @@ 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>';
+                }
             }
 	}
-    } else {
+        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'}:''))) {
-	    if ($outputtarget ne 'tex') {
-		$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) {
+                    $discussion .= '&nbsp;'.&mt('(Closed for [_1] roles)',
+                                                &Apache::lonnet::plaintext('st',$crstype));
+                }
             }
 	} else {
-            if ($outputtarget ne 'tex') {
-                $discussion.= &mt('This discussion is closed.');
-            }
-        }
-        if ($outputtarget ne 'tex') {
-	    $discussion.= &send_message_link($ressymb);
+            $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
         }
-        $discussion.='</div>';
+	$discussion.= &send_message_link($ressymb).'</div>';
     }
     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,400);
+}
+
+
 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 {
@@ -787,7 +808,7 @@ sub action_links_bar {
                      '<table width="100%" class="LC_disc_action_table"><tr>'.
                      '<td class="LC_disc_action_left">';
     my $escsymb=&escape($ressymb);
-    if ($visible>2) {
+    if ($visible) {
         $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&amp;previous='.$prevread;
@@ -835,7 +856,6 @@ sub action_links_bar {
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
         $currnewattach,$currdelold,$group,$crstype) = @_;
-    if ($outputtarget eq 'tex') { return ''; }
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
               'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
@@ -851,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'}" />
@@ -906,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;
@@ -922,6 +947,19 @@ sub build_posting_display {
     if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
         $skip_group_check = 1;
     }
+    my (%deletions,%hiddens);
+    if ($contrib{'deleted'}) {
+       my $deleted = $contrib{'deleted'};
+       $deleted =~ s/^\.//;
+       $deleted =~ s/\.$//;
+       %deletions = map { $_ => 1 } (split(/\.\./,$deleted));
+    }
+    if ($contrib{'hidden'}) {
+       my $hidden = $contrib{'hidden'};
+       $hidden =~ s/^\.//;
+       $hidden =~ s/\.$//;
+       %hiddens = map { $_ => 1 } (split(/\.\./,$hidden));
+    }
     if ($contrib{'version'}) {
         my $oldest = $contrib{'1:timestamp'};
         if ($prevread eq '0') {
@@ -935,13 +973,13 @@ sub build_posting_display {
         } 
 	for (my $id=1;$id<=$contrib{'version'};$id++) {
 	    my $idx=$id;
+            next if ($contrib{$idx.':deleted'});
+            next if ($contrib{$idx.':hidden'});
             my $posttime = $contrib{$idx.':timestamp'};
             if ($prevread <= $posttime) {
                 $$newpostsflag = 1;
             }
-	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
             my $studenthidden=($contrib{'studenthidden'}=~/\.$idx\./);
-	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
 	    my $origindex='0.';
             my $numoldver=0;
 	    if ($contrib{$idx.':replyto'}) {
@@ -965,7 +1003,7 @@ sub build_posting_display {
 	    } else {
 		$$replies[$$depth[$idx]]=1;
 	    }
-	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+            unless ((($hiddens{$idx}) && (!$seeid)) || ($deletions{$idx})) {
 		$$visible++;
                 if ($contrib{$idx.':history'}) {
                     if ($contrib{$idx.':history'} =~ /:/) {
@@ -999,7 +1037,7 @@ sub build_posting_display {
                     $message.=$attachtxt{$numoldver};
                     $subject=$subjects{$numoldver};
                     if ($message) {
-	  	        if ($hidden) {
+	  	        if ($hiddens{$idx}) {
 			    $message='<font color="#888888">'.$message.'</font>';
                             if ($studenthidden) {
                                 $message .='<br /><br />Deleted by poster (student).';
@@ -1063,48 +1101,50 @@ sub build_posting_display {
                             } else {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
-                            if ((&editing_allowed($escsymb.':::'.$idx,$group)) && ($outputtarget ne 'tex')) {
-                                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>';
+                            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 .= '">'.&mt('Edit').'</a>';
                                     
-                                    unless ($seeid) {
-                                        my $grpargs = &group_args($group);
-                                        $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
-                                        $sender .= '">'.&mt('Delete').'</a>';
+                                        unless ($seeid) {
+                                            my $grpargs = &group_args($group);
+                                            $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
+                                            $sender .= '">'.&mt('Delete').'</a>';
+                                        }
                                     }
                                 }
-                            } 
-			    if (($seeid) && ($outputtarget ne 'tex')) {
-			        if ($hidden) {
-                                    unless ($studenthidden) {
-			                $sender.=' <a href="/adm/feedback?unhide='.
-				                $escsymb.':::'.$idx;
+			        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>';
+                                        }
+			            } else {
+				        $sender.=' <a href="/adm/feedback?hide='.
+				                 $escsymb.':::'.$idx;
                                         if ($$newpostsflag) {
                                             $sender .= '&amp;previous='.$prevread;
                                         }
-                                        $sender .= '">'.&mt('Make Visible').'</a>';
-                                    }
-			        } else {
-				    $sender.=' <a href="/adm/feedback?hide='.
-				        $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-				    $sender .= &group_args($group);
-                                    $sender .= '">'.&mt('Hide').'</a>';
-			        }
-                                my $grpargs = &group_args($group);
-			        $sender.= 
-                                    " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
-                                $sender .= &mt('Delete').'</a>';
+				        $sender .= &group_args($group);
+                                        $sender .= '">'.&mt('Hide').'</a>';
+			            }
+                                    my $grpargs = &group_args($group);
+			            $sender.= 
+                                        " <a href=\"javascript:verifydelete('seeiddelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')\">";
+                                    $sender .= &mt('Delete').'</a>';
+                                }
                             }
-		        } else {
+                        } else {
 			    if ($screenname) {
 			        $sender='<i>'.$screenname.'</i>';
 			    } else {
@@ -1130,36 +1170,29 @@ sub build_posting_display {
                                 @{$$namesort{'__anon'}{'__anon'}} = ("$idx");
                             }
 		        }
-		        if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
-                            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>';
-                            } 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;
+                        if ($outputtarget ne 'tex') {
+		            if (&discussion_open($status)) {
+                                if (($group ne '') && 
+                                    (&check_group_priv($group,'pgd') eq 'ok')) {
+                                     $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.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
                                 }
-                                $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                             }
-                        }
-		        if (($viewgrades) && ($outputtarget ne 'tex')) {
+		            if ($viewgrades) {
 			        $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
-                            $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
-		        }
-                        if (($$dischash{$readkey}=~/\.$idx\./) && ($outputtarget ne 'tex')) { 
-                            $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
-                        } else {
-                            $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
+                                $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
+		            }
+                            if ($$dischash{$readkey}=~/\.$idx\./) { 
+                                $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
+                            } else {
+                                $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
+                            }
                         }
                     }
 #figure out at what position this needs to print
@@ -1176,7 +1209,7 @@ sub build_posting_display {
                 if ($outputtarget eq 'export') {
                     %{$$imsitems{$idx}} = ();
                     $$imsitems{$idx}{'isvisible'}='true';
-                    if ($hidden) {
+                    if ($hiddens{$idx}) {
                         $$imsitems{$idx}{'isvisible'}='false';
                     }
                     $$imsitems{$idx}{'title'}=$subjects{$numoldver};
@@ -1683,6 +1716,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
@@ -1690,10 +1728,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);
@@ -1710,6 +1748,7 @@ $start_page
 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);
@@ -2259,7 +2298,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;
         }
@@ -2532,12 +2571,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
@@ -2592,7 +2633,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');
@@ -2641,10 +2682,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" /> '.
@@ -2783,7 +2833,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___/) {
@@ -2791,9 +2841,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'},
@@ -3051,9 +3108,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);
@@ -3414,7 +3473,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)'),
@@ -3465,10 +3524,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'}) {
@@ -3760,7 +3820,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];
       }
@@ -3800,7 +3860,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) {
@@ -3838,7 +3898,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 {
@@ -3894,7 +3954,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,
@@ -3916,7 +3980,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++;
       }