--- loncom/interface/lonfeedback.pm	2003/11/07 21:21:17	1.69
+++ loncom/interface/lonfeedback.pm	2004/05/05 21:04:14	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.69 2003/11/07 21:21:17 www Exp $
+# $Id: lonfeedback.pm,v 1.80 2004/05/05 21:04:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,24 +25,7 @@
 #
 # http://www.lon-capa.org/
 #
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
-# 2/9 Guy Albertelli
-# 2/10 Gerd Kortemeyer
-# 2/13 Guy Albertelli
-# 7/25 Gerd Kortemeyer
-# 7/26 Guy Albertelli
-# 7/26,8/10,10/1,11/5,11/6,12/27,12/29 Gerd Kortemeyer
-# YEAR=2002
-# 1/1,1/16 Gerd Kortemeyer
-#
+###
 
 package Apache::lonfeedback;
 
@@ -54,7 +37,12 @@ use Apache::lontexconvert();
 use Apache::lonlocal;
 
 sub list_discussion {
-    my ($mode,$status,$symb)=@_;
+    my ($mode,$status,$symb,$previous)=@_;
+#    &Apache::lonnet::logthis("status is $status");
+    if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
+	  || $status eq 'OPEN')) {
+	return '';
+    }
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
     unless ($ENV{'request.course.id'}) { return ''; }
@@ -67,10 +55,45 @@ sub list_discussion {
 	$symb=&Apache::lonnet::symbread();
     }
     unless ($symb) { return ''; }
+
+# backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb=$symb;
+    if ($mode eq 'board') {
+        unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+            $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+        }
+    }
+
+# Get discussion display settings for this discussion
+    my $lastkey = $ressymb.'_lastread';
+    my $showkey = $ressymb.'_showonlyunread';
+    my $visitkey = $ressymb.'_visit';
+    my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey],$ENV{'user.domain'},$ENV{'user.name'});
+    my $showonlyunread = 0;
+    my $prevread = 0;
+    my $visit = 0;
+    my $newpostsflag = 0;
+
+    if ($previous > 0) {
+        $prevread = $previous;
+    } elsif (defined($dischash{$lastkey})) {
+        $prevread = $dischash{$lastkey};
+    }
+
+    if (defined($dischash{$showkey})) {
+        $showonlyunread = $dischash{$showkey};
+    }
+
+    if (defined($dischash{$visitkey})) {
+        $visit = $dischash{$visitkey};
+    }
+    $visit ++;
+
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
+    my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
+	&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
     my @discussionitems=();
-    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+    my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my $visible=0;
@@ -79,6 +102,7 @@ sub list_discussion {
     my @index=();
     my @replies=();
     my %alldiscussion=();
+    my %notshown = ();
     my $maxdepth=0;
 
     my $target='';
@@ -86,9 +110,21 @@ sub list_discussion {
 	    $ENV{'environment.remote'} eq 'off' ) {
 	$target='target="LONcom"';
     }
+    
+    my $now = time;
+    my %discinfo = ();
+    $discinfo{$visitkey} = $visit;
+    $discinfo{$lastkey} = $now;
+
+    &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+
     if ($contrib{'version'}) {
 	for (my $id=1;$id<=$contrib{'version'};$id++) {
 	    my $idx=$id;
+            my $posttime = $contrib{$idx.':timestamp'};
+            if ($prevread > 0 && $prevread <= $posttime) {
+                $newpostsflag = 1;
+            }
 	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
 	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
 	    my $origindex='0.';
@@ -113,6 +149,11 @@ sub list_discussion {
 		my $message=$contrib{$idx.':message'};
 		$message=~s/\n/\<br \/\>/g;
 		$message=&Apache::lontexconvert::msgtexconverted($message);
+                my $subject=$contrib{$idx.':subject'};
+                if (defined($subject)) {
+                    $subject=~s/\n/\<br \/\>/g;
+                    $subject=&Apache::lontexconvert::msgtexconverted($subject);
+                }
 		if ($contrib{$idx.':attachmenturl'}) {
 		    my ($fname,$ft)
                         =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
@@ -147,25 +188,41 @@ sub list_discussion {
 			if ($seeid) {
 			    if ($hidden) {
 				$sender.=' <a href="/adm/feedback?unhide='.
-				    $symb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
+				    $ressymb.':::'.$idx;
+                                if ($newpostsflag) {
+                                    $sender .= '&previous='.$prevread;
+                                }
+                                $sender .= '">'.&mt('Make Visible').'</a>';
 			    } else {
 				$sender.=' <a href="/adm/feedback?hide='.
-				    $symb.':::'.$idx.'">'.&mt('Hide').'</a>';
+				    $ressymb.':::'.$idx;
+                                if ($newpostsflag) {
+                                    $sender .= '&previous='.$prevread;
+                                }
+                                $sender .= '">'.&mt('Hide').'</a>';
 			    }                     
 			    $sender.=' <a href="/adm/feedback?deldisc='.
-				$symb.':::'.$idx.'">'.&mt('Delete').'</a>';
-			}
-			if (&Apache::lonnet::allowed('pch',
-				   $ENV{'request.course.id'}.
-	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-			    $sender.=' <a href="/adm/feedback?replydisc='.
-				$symb.':::'.$idx.'" '.$target.'>'.&mt('Reply').'</a>';
+				$ressymb.':::'.$idx;
+                                if ($newpostsflag) {
+                                    $sender .= '&previous='.$prevread;
+                                }
+                                $sender .= '">'.&mt('Delete').'</a>';
 			}
 		    } else {
 			if ($screenname) {
 			    $sender='<i>'.$screenname.'</i>';
 			}
 		    }
+		    if (&Apache::lonnet::allowed('pch',
+						 $ENV{'request.course.id'}.
+						 ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			$sender.=' <a href="/adm/feedback?replydisc='.
+			    $ressymb.':::'.$idx;
+                        if ($newpostsflag) {
+                            $sender .= '&previous='.$prevread;
+                        }
+                        $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
+		    }
 		    my $vgrlink;
 		    if ($viewgrades) {
 			$vgrlink=&Apache::loncommon::submlink('Submissions',
@@ -178,48 +235,89 @@ sub list_discussion {
 		    }
 		    $alldiscussion{$thisindex}=$idx;
 		    $index[$idx]=$thisindex;
-		    $discussionitems[$idx]='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
-			localtime($contrib{$idx.':timestamp'}).
-			'):<blockquote>'.$message.
-			'</blockquote></p>';
-	        }
-	    } 
+                    my $spansize = 2;
+                    if ($showonlyunread && $prevread > $posttime) {
+                        $notshown{$idx} = 1;
+                    } else {
+                        $discussionitems[$idx]='<p><table border="0" width="100%"><tr>';
+                        if ($prevread > 0 && $prevread <= $posttime) {
+                            $discussionitems[$idx] .= '<td align="left" bgcolor="#FFFFFF"><font color="#FF0000">NEW</font></td>';
+                        }
+                        $discussionitems[$idx] .= '<td align ="left">&nbsp;&nbsp;'.
+                            '<b>'.$subject.'</b>&nbsp;&nbsp;'.
+                            $sender.'</b> '.$vgrlink.' ('.
+                            localtime($posttime).')</td></tr>'.
+                            '</table><blockquote>'.$message.'</blockquote></p>';
+                    }
+                }
+            }
 	}
     }
+
     my $discussion='';
     if ($visible) {
-# Print a the discusssion
+# Print the discusssion
 	$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
 	if ($visible>2) {
 	    my $colspan=$maxdepth+1;
 	    $discussion.='<tr><td bgcolor="DDDDBB" colspan="'.$colspan.'">'.
-  '<a href="/adm/feedback?threadedon='.$symb.'">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
-  '<a href="/adm/feedback?threadedoff='.$symb.'">'.&mt('Chronological View').'</a>'.
-  '</td></tr>';
+            '<table border="0" width="100%" bgcolor="#DDDDBB"><tr><td align="left">'.
+            '<a href="/adm/feedback?threadedon='.$ressymb.'">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
+            '<a href="/adm/feedback?threadedoff='.$ressymb.'">'.&mt('Chronological View').'</a>&nbsp;&nbsp;</td>'.
+            '<td align="right"><a href="/adm/feedback?';
+            if ($showonlyunread) {
+                $discussion .= 'allposts='.$ressymb;
+                if ($newpostsflag) {
+                    $discussion .= '&previous='.$prevread;
+                }
+                $discussion .='">'.&mt('Show all posts').'?';
+            } else {
+                $discussion .= 'onlyunread='.$ressymb;
+                if ($newpostsflag) {
+                    $discussion .= '&previous='.$prevread;
+                }
+                $discussion .= '">'.&mt('Show only unread posts').'?';
+            }
+            $discussion .= '</a>&nbsp;&nbsp;</td></tr></table></td></tr>';
 	}
-
+        my $numhidden = keys %notshown;
+        if ($numhidden > 0) {
+            my $colspan = $maxdepth+1;
+            $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
+                         '<a href="/adm/feedback?allposts='.$ressymb;
+            if ($newpostsflag) {
+                $discussion .= '&previous='.$prevread;
+            }
+            $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
+                         $numhidden.' '.&mt('previously viewed posts').
+                         '<br/></td></tr>';
+        }
 	foreach (sort { $a <=> $b } keys %alldiscussion) {
-	    $discussion.="\n<tr>";
-	    my $thisdepth=$depth[$alldiscussion{$_}];
-	    for (1..$thisdepth) {
-		$discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
+            unless ($notshown{$alldiscussion{$_}} eq '1') {
+	        $discussion.="\n<tr>";
+	        my $thisdepth=$depth[$alldiscussion{$_}];
+	        for (1..$thisdepth) {
+		    $discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
+	        }
+	        my $colspan=$maxdepth-$thisdepth+1;
+                $discussion.='<td  bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
+                             $discussionitems[$alldiscussion{$_}].
+	                     '</td></tr>';
 	    }
-	    my $colspan=$maxdepth-$thisdepth+1;
-            $discussion.="<td  bgcolor='#CCCCCC' colspan='".$colspan."'>".$discussionitems[$alldiscussion{$_}].
-		"</td></tr>";
-	}
-        $discussion.='</table>';
+        }
+        $discussion.='</table><br /><br />';
     }
     if ($discussiononly) {
 	$discussion.=(<<ENDDISCUSS);
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
 <input type="submit" name="discuss" value="Post Discussion" />
 <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
-<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />
 <br />
 <font size="1">Note: in anonymous discussion, your name is visible only to
 course faculty</font><br />
+<b>Title:</b>&nbsp;<input type="text" name="subject" value="" size="30" /><br /><br />
 <textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
 <p>
 Attachment (128 KB max size): <input type="file" name="attachment" />
@@ -227,7 +325,16 @@ Attachment (128 KB max size): <input typ
 </form>
 ENDDISCUSS
       $discussion.=&generate_preview_button();
-   }
+    } else {
+	if (&Apache::lonnet::allowed('pch',
+				   $ENV{'request.course.id'}.
+	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			    $discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
+				$symb.':::" '.$target.'>'.
+				'<img src="/adm/lonMisc/chat.gif" border="0" />'.
+				&mt('Post Discussion').'</a></td></tr></table>';
+			}
+    }
    return $discussion;
 }
 
@@ -238,18 +345,27 @@ sub mail_screen {
   my $title=&Apache::lonnet::gettitle($feedurl);
   if (!$title) { $title = $feedurl; }
   my $quote='';
+  my $subject = '';
+  my $prevtag = '';
   if ($ENV{'form.replydisc'}) {
       my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
       my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
 					   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 					   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-      unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) { 
+      unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
 	  my $message=$contrib{$idx.':message'};
 	  $message=~s/\n/\<br \/\>/g;
 	  $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($message).'</blockquote>';
+          if ($idx > 0) {
+              $subject = 'Re: '.$contrib{$idx.':subject'};
+          }
+      }
+      if ($ENV{'form.previous'}) {
+          $prevtag = '<input type="hidden" name="previous" value="'.$ENV{'form.previous'}.'" />';
       }
   }
   my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+  my $send=&mt('Send');
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
@@ -303,6 +419,7 @@ $bodytag
 <h2><tt>$title</tt></h2>
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
+$prevtag
 <input type="hidden" name="postdata" value="$feedurl" />
 <input type="hidden" name="replydisc" value="$ENV{'form.replydisc'}" />
 Please check at least one of the following feedback types:
@@ -311,6 +428,8 @@ $quote
 <p>My question/comment/feedback:</p>
 <p>
 $latexHelp
+Title: <input type="text" name="subject" size="30" value="$subject" /></p>
+<p>
 <textarea name="comment" cols="60" rows="10" wrap="hard">
 </textarea></p>
 <p>
@@ -318,7 +437,7 @@ Attachment (128 KB max size): <input typ
 </p>
 <p>
 <input type="hidden" name="sendit" value="1" />
-<input type="button" value="Send Feedback" onClick='gosubmit();' />
+<input type="button" value="$send" onClick='gosubmit();' />
 </p>
 </form>
 ENDDOCUMENT
@@ -327,12 +446,13 @@ $r->print(&generate_preview_button().'</
 
 sub fail_redirect {
   my ($r,$feedurl) = @_;
+  if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   $r->print (<<ENDFAILREDIR);
+<html>
 <head><title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
-<html>
 <body bgcolor="#FFFFFF">
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no recipients  ...</b>
@@ -342,20 +462,33 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous) = @_;
+  my $prevtag = '';
+  my $qrystr = '';
+  if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+  if ($previous > 0) {
+      $qrystr = 'previous='.$previous;
+      if ($feedurl =~ /\?register=1/) {
+          $feedurl .= '&'.$qrystr;
+      } else {
+          $feedurl .= '?'.$qrystr;
+      }
+      $prevtag = '<input type="hidden" name="previous" value="'.$previous.'" />';
+  }
   $r->print (<<ENDREDIR);
+<html>
 <head>
 <title>Feedback sent</title>
 <meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
-<html>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">
+$prevtag
 </form>
 </body>
 </html>
@@ -365,6 +498,7 @@ ENDREDIR
 sub no_redirect_back {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDNOREDIR);
+<html>
 <head><title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 ENDNOREDIR
@@ -375,7 +509,6 @@ ENDNOREDIR
   
   $r->print (<<ENDNOREDIRTWO);
 </head>
-<html>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no feedback possible on this resource  ...</b>
@@ -414,16 +547,17 @@ sub screen_header {
 	if (&Apache::lonnet::allowed('pch',
 				     $ENV{'request.course.id'}.
 				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" /> '.
+	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
+		($ENV{'form.replydisc'}?' checked="1"':'').' /> '.
 		&mt('Contribution to course discussion of resource');
 	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
 		&mt('Anonymous contribution to course discussion of resource').
 		' <i>('.&mt('name only visible to course faculty').')</i>';
       }
     }
-    if ($msgoptions) { $msgoptions='<h2>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
-	$discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }
 
@@ -581,7 +715,7 @@ sub send_msg {
 }
 
 sub adddiscuss {
-    my ($symb,$email,$anon,$attachmenturl)=@_;
+    my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
     my $status='';
     if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -594,7 +728,8 @@ sub adddiscuss {
 		                   $ENV{'environment.middlename'}.' '.
                                    $ENV{'environment.lastname'}.' '.
                                    $ENV{'enrironment.generation'},
-                 'attachmenturl'=> $attachmenturl);
+                 'attachmenturl'=> $attachmenturl,
+                 'subject'      => $subject);
     if ($ENV{'form.replydisc'}) {
 	$contrib{'replyto'}=(split(/\:\:\:/,$ENV{'form.replydisc'}))[1];
     }
@@ -634,7 +769,11 @@ sub show_preview {
     my $message=&clear_out_html($ENV{'form.comment'});
     $message=~s/\n/\<br \/\>/g;
     $message=&Apache::lontexconvert::msgtexconverted($message);
+    my $subject=&clear_out_html($ENV{'form.subject'});
+    $subject=~s/\n/\<br \/\>/g;
+    $subject=&Apache::lontexconvert::msgtexconverted($subject);
     $r->print('<table border="2"><tr><td>'.
+       '<b>Subject:</b> '.$subject.'<br /><br />'.
        $message.'</td></tr></table>');
 }
 
@@ -642,16 +781,18 @@ sub generate_preview_button {
     my $pre=&mt("Show Preview");
     return(<<ENDPREVIEW);
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
+<input type="hidden" name="subject">
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="this.form.comment.value=document.mailform.comment.value;this.form.submit();" />
+onClick="this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
 </form>
 ENDPREVIEW
 }
+
 sub handler {
   my $r = shift;
   if ($r->header_only) {
-     $r->content_type('text/html');
+     &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
      return OK;
   }
@@ -659,11 +800,32 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff']);
+         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous']);
 
-  if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
+  if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
+# ----------------------------------------------------------------- Modify display setting for this discussion 
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
+      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      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 %readinghash = ();
+                                                                                 
+      if ($contrib{'version'}) {
+          if ($ENV{'form.allposts'}) {
+              $readinghash{$symb.'_showonlyunread'} = 0;
+          } elsif ($ENV{'form.onlyunread'}) {
+              $readinghash{$symb.'_showonlyunread'} = 1;
+          }
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%readinghash,$ENV{'user.domain'},$ENV{'user.name'});
+      }
+      &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status').'<br />','0','0','',$ENV{'form.previous'});
+      return OK;
+  } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
     my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
@@ -690,22 +852,24 @@ sub handler {
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed discussion status').'<br />','0','0');
+       &mt('Changed discussion status').'<br />','0','0','',$ENV{'form.previous'});
   } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
       if ($ENV{'form.threadedon'}) {
 	  &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
 	  &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
       } else {
  	  &Apache::lonnet::del('environment',['threadeddiscussion']);
 	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
-     }
+      }
       my $symb=$ENV{'form.threadedon'}?$ENV{'form.threadedon'}:$ENV{'form.threadedoff'};
       my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
       &redirect_back($r,&Apache::lonnet::clutter($url),
-		     &mt('Changed discussion view mode').'<br />','0','0');
+		     &mt('Changed discussion view mode').'<br />','0','0','',$ENV{'form.previous'});
   } elsif ($ENV{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
     my $entry=$ENV{'form.deldisc'};
@@ -729,9 +893,11 @@ sub handler {
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed discussion status').'<br />','0','0');
+       &mt('Changed discussion status').'<br />','0','0','',$ENV{'form.previous'});
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
+      $r->content_type('text/html');
+      $r->send_http_header;
       &show_preview($r);
   } else {
 # ------------------------------------------------------------- Normal feedback
@@ -760,10 +926,13 @@ sub handler {
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
   }
-
+  # backward compatibility (bulltin boards used to be 'wrapped')
+  if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+      $feedurl=~s|^/adm/wrapper||;
+  }
   if ($goahead) {
 # Go ahead with feedback, no ambiguous reference
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
   
     if (
@@ -824,18 +993,20 @@ sub handler {
 
       my $numpost=0;
       if ($ENV{'form.discuss'}) {
-	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl);
+          my $subject = &clear_out_html($ENV{'form.subject'});
+	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject);
 	  $numpost++;
       }
 
       if ($ENV{'form.anondiscuss'}) {
-	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl);
+          my $subject = &clear_out_html($ENV{'form.subject'});
+	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl,$subject);
 	  $numpost++;
       }
 
 
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$ENV{'form.previous'});
 
     }
    } else {