--- loncom/interface/lonfeedback.pm	2010/08/14 18:14:29	1.290.2.2
+++ loncom/interface/lonfeedback.pm	2012/03/06 21:24:01	1.290.2.7.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.290.2.2 2010/08/14 18:14:29 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.290.2.7.2.1 2012/03/06 21:24:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -727,9 +727,10 @@ END
                 $attachnum += @{$currnewattach};
             }
         }
-	if (&discussion_open($status) && ($outputtarget ne 'tex')) {
-            if (($group ne '') && ($mode eq 'board')) {  
-                if (&check_group_priv($group,'pgd') eq 'ok') {
+	if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
+            if (($group ne '') && ($mode eq 'board')) {
+                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,
@@ -737,12 +738,23 @@ 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) &&
@@ -760,8 +772,7 @@ END
         } else {
             $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
         }
-	$discussion.= &send_message_link($ressymb).
-                      '</div>';
+	$discussion.= &send_message_link($ressymb).'</div>';
     }
     return $discussion;
 }
@@ -793,7 +804,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;
@@ -856,6 +867,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'}" />
@@ -865,7 +881,7 @@ sub postingform_display {
 <br /><a name="newpost"></a>
 <font size="1">$lt{'note'}</font><br />
 <b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14"id="comment" $textareaclass>$comment</textarea>
+<textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
 ENDDISCUSS
     if ($env{'form.origpage'}) {
         $postingform .= '<input type="hidden" name="origpage" value="'.
@@ -927,6 +943,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') {
@@ -940,13 +969,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'}) {
@@ -970,7 +999,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'} =~ /:/) {
@@ -985,7 +1014,7 @@ sub build_posting_display {
                 my %subjects = ();
                 my %attachtxt = ();
                 my %allattachments = ();
-                my ($screenname,$plainname);
+                my ($screenname,$plainname,$showaboutme);
                 my $sender = &mt('Anonymous');
 # Anonymous users getting number within a discussion
 # Since idx is in static order, this should give the same sequence every time. 
@@ -995,7 +1024,7 @@ sub build_posting_display {
 		    $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
 		}
                 my ($message,$subject,$vgrlink,$ctlink);
-                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
+                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
 
 
 # Set up for sorting by subject
@@ -1004,7 +1033,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).';
@@ -1025,12 +1054,18 @@ sub build_posting_display {
                             }
                         }
 		        if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
-			    $sender=&Apache::loncommon::aboutmewrapper(
-					 $plainname,
-					 $contrib{$idx.':sendername'},
-					 $contrib{$idx.':senderdomain'}).' ('.
-					 $contrib{$idx.':sendername'}.':'.
-					 $contrib{$idx.':senderdomain'}.')';
+                            if ($showaboutme) {
+                                $sender = &Apache::loncommon::aboutmewrapper(
+                                              $plainname,
+                                              $contrib{$idx.':sendername'},
+                                              $contrib{$idx.':senderdomain'});
+                            } else {
+                                $sender = $plainname;
+                            }
+                            if ($see_anonymous) {
+                                $sender .= ' ('.$contrib{$idx.':sendername'}.':'.
+                                           $contrib{$idx.':senderdomain'}.')';
+                            }
                             $sender = '<b>'.$sender.'</b>';
 			    if ($contrib{$idx.':anonymous'}) {
 			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
@@ -1087,7 +1122,7 @@ sub build_posting_display {
                                     }
                                 }
                                 if ($seeid) {
-			            if ($hidden) {
+			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
 			                    $sender.=' <a href="/adm/feedback?unhide='.
 				                    $escsymb.':::'.$idx;
@@ -1185,7 +1220,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};
@@ -1267,7 +1302,7 @@ sub build_posting_display {
                                 $$newitem{$idx} = 1;
                                 $$discussionitems[$idx] .= '
                                   <table border="0" width="100%">
-                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'</b></font></td>';
+                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'&nbsp;</b></font></td>';
                             } else {
                                 $$newitem{$idx} = 0;
                                 $$discussionitems[$idx] .= '
@@ -1367,7 +1402,7 @@ sub filter_regexp {
 
 
 sub get_post_contents {
-    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
+    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$numver) = @_;
     my $discussion = '';
     my $start=$numver;
     my $end=$numver + 1;
@@ -1385,13 +1420,20 @@ sub get_post_contents {
                                         $$contrib{$idx.':sendername'},
                                         $$contrib{$idx.':senderdomain'});
     $$screenname=$$contrib{$idx.':screenname'};
-
-    my $sender=&Apache::loncommon::aboutmewrapper(
-                                 $$plainname,
-                                 $$contrib{$idx.':sendername'},
-                                 $$contrib{$idx.':senderdomain'}).' ('.
-                                 $$contrib{$idx.':sendername'}.':'.
-                                 $$contrib{$idx.':senderdomain'}.')';
+    $$showaboutme = &Apache::lonnet::usertools_access($$contrib{$idx.':sendername'},
+                                                      $$contrib{$idx.':senderdomain'},
+                                                      'aboutme');
+    my $sender = $$plainname;
+    if ($$showaboutme) {
+        $sender = &Apache::loncommon::aboutmewrapper(
+                                                     $$plainname,
+                                                     $$contrib{$idx.':sendername'},
+                                                     $$contrib{$idx.':senderdomain'});
+    }
+    if ($seeid) {
+        $sender .= ' ('. $$contrib{$idx.':sendername'}.':'.
+                   $$contrib{$idx.':senderdomain'}.')';
+    }
     my $attachmenturls = $$contrib{$idx.':attachmenturl'};
     my @postversions = ();
     if ($type eq 'allversions' || $type eq 'export') {
@@ -1692,6 +1734,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
@@ -2268,7 +2315,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;
         }
@@ -2609,7 +2656,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');
@@ -2658,10 +2705,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',
+        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'}:''))) {
+				     ($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" /> '.
@@ -2800,7 +2856,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___/) {
@@ -2808,9 +2864,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'},
@@ -3512,11 +3575,11 @@ sub handler {
           my %attachmsgs = ();
           my %allattachments = ();
           my %imsfiles = ();
-          my ($screenname,$plainname);
+          my ($screenname,$plainname,$showaboutme);
           my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
                            $env{'course.'.$env{'request.course.id'}.'.domain'},
                            $env{'course.'.$env{'request.course.id'}.'.num'});
-          $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname));
+          $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname,\$showaboutme));
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;
@@ -3859,7 +3922,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 {
@@ -3915,7 +3978,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,
@@ -3937,7 +4004,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++;
       }