--- loncom/interface/lonfeedback.pm	2004/06/12 01:07:10	1.94
+++ loncom/interface/lonfeedback.pm	2004/07/21 23:57:24	1.101
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.94 2004/06/12 01:07:10 www Exp $
+# $Id: lonfeedback.pm,v 1.101 2004/07/21 23:57:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,12 +65,14 @@ sub discussion_visible {
 sub list_discussion {
     my ($mode,$status,$symb)=@_;
 
+    my $outputtarget=$ENV{'form.grade_target'};
     if (not &discussion_visible($status)) { return ''; }
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
     unless ($ENV{'request.course.id'}) { return ''; }
     my $crs='/'.$ENV{'request.course.id'};
+    my $cid=$ENV{'request.course.id'};
     if ($ENV{'request.course.sec'}) {
 	$crs.='_'.$ENV{'request.course.sec'};
     }                 
@@ -79,7 +81,9 @@ sub list_discussion {
 	$symb=&Apache::lonnet::symbread();
     }
     unless ($symb) { return ''; }
-
+    my %usernamesort = ();
+    my %namesort =();
+    my %subjectsort = ();
 # backward compatibility (bulletin boards used to be 'wrapped')
     my $ressymb=$symb;
     if ($mode eq 'board') {
@@ -93,7 +97,8 @@ sub list_discussion {
     my $showkey = $ressymb.'_showonlyunread';
     my $visitkey = $ressymb.'_visit';
     my $ondispkey = $ressymb.'_markondisp';
-    my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'});
+    my $userpickkey = $ressymb.'_userpick';
+    my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey,$userpickkey],$ENV{'user.domain'},$ENV{'user.name'});
     my %discinfo = ();
     my $showonlyunread = 0;
     my $markondisp = 0;
@@ -101,9 +106,15 @@ sub list_discussion {
     my $previous = 0;
     my $visit = 0;
     my $newpostsflag = 0;
+    my @posters = split/\&/,$dischash{$userpickkey};
 
 # Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','totposters']);
+    my $sortposts = $ENV{'form.sortposts'};
+    my $rolefilter = $ENV{'form.rolefilter'};
+    my $statusfilter = $ENV{'form.statusfilter'};
+    my $sectionpick = $ENV{'form.sectionpick'};
+    my $totposters = $ENV{'form.totposters'};
     $previous = $ENV{'form.previous'};
     if ($previous > 0) {
         $prevread = $previous;
@@ -113,6 +124,34 @@ sub list_discussion {
         }
     }
 
+# Get information about students and non-stundents in course for filtering display of posts
+    my %roleshash = ();
+    my %roleinfo = ();
+    if ($rolefilter) {
+        %roleshash = &Apache::lonnet::dump('nohist_userroles',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+        foreach (keys %roleshash) {
+            my ($role,$uname,$udom,$sec) = split/:/,$_;
+            my ($end,$start) = split/:/,$roleshash{$_};
+            my $now = time;
+            my $status = 'Active';
+            if (($now < $start) || ($end > 0 && $now > $end)) {
+                $status = 'Expired';
+            }
+            push @{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status;
+        }
+        my ($classlist) = &Apache::loncoursedata::get_classlist(
+                              $ENV{'request.course.id'},
+                              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+                              $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+        my $sec_index = &Apache::loncoursedata::CL_SECTION();
+        my $status_index = &Apache::loncoursedata::CL_STATUS();
+        while (my ($student,$data) = each %$classlist) {
+            my ($section,$status) = ($data->[$sec_index],
+                                 $data->[$status_index]);
+            push @{$roleinfo{$student}}, 'st:'.$section.':'.$status;
+        }
+    }
+
 # Get discussion display default settings for user
     my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'});
     my $discdisplay=$userenv{'discdisplay'};
@@ -145,6 +184,8 @@ sub list_discussion {
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
 	&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
     my @discussionitems=();
+    my %shown = ();
+    my @posteridentity=();
     my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -183,12 +224,17 @@ sub list_discussion {
 	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
 	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
 	    my $origindex='0.';
-	    if (($contrib{$idx.':replyto'}) && ($ENV{'environment.threadeddiscussion'})) {
+	    if ($contrib{$idx.':replyto'}) {
+                if ( (($ENV{'environment.threadeddiscussion'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread')) {
 # this is a follow-up message
-		$original[$idx]=$original[$contrib{$idx.':replyto'}];
-		$depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;
-		$origindex=$index[$contrib{$idx.':replyto'}];
-		if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; }
+		    $original[$idx]=$original[$contrib{$idx.':replyto'}];
+		    $depth[$idx]=$depth[$contrib{$idx.':replyto'}]+1;
+		    $origindex=$index[$contrib{$idx.':replyto'}];
+		    if ($depth[$idx]>$maxdepth) { $maxdepth=$depth[$idx]; }
+                } else {
+                    $original[$idx]=0;
+                    $depth[$idx]=0;
+                }
 	    } else {
 # this is an original message
 		$original[$idx]=0;
@@ -230,6 +276,20 @@ sub list_discussion {
 					    $contrib{$idx.':senderdomain'});
 		    
 		    my $sender=&mt('Anonymous');
+# Set up for sorting by subject
+                    if ($contrib{$idx.':subject'} eq '') {
+                        if (defined($subjectsort{'__No subject'})) {
+                            push @{$subjectsort{'__No subject'}}, $idx;
+                        } else {
+                            @{$subjectsort{'__No subject'}} = ("$idx");
+                        }
+                    } else {
+                        if (defined($subjectsort{$contrib{$idx.':subject'}})) {
+                            push @{$subjectsort{$contrib{$idx.':subject'}}}, $idx;
+                        } else {
+                            @{$subjectsort{$contrib{$idx.':subject'}}} = ("$idx");
+                        }
+                    }
 		    if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
 			$sender=&Apache::loncommon::aboutmewrapper(
 					 $plainname,
@@ -241,6 +301,34 @@ sub list_discussion {
 			    $sender.=' ['.&mt('anonymous').'] '.
 				$screenname;
 			}
+# Set up for sorting by domain, then username
+                        unless (defined($usernamesort{$contrib{$idx.':senderdomain'}})) {
+                            %{$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
+                        }
+                        if (defined($usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}})) {
+                            push @{$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}}, $idx;
+                        } else {
+                            @{$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
+                        }
+# Set up for sorting by last name, then first name
+                        my %names = &Apache::lonnet::get('environment',['firstname','lastname'],
+                                  $contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+                        my $lastname = $names{'lastname'};
+                        my $firstname = $names{'firstname'};
+                        if ($lastname eq '') {
+                            $lastname = '_';
+                        }
+                        if ($firstname eq '') {
+                            $firstname = '_';
+                        }
+                        unless (defined($namesort{$lastname})) {
+                            %{$namesort{$lastname}} = ();
+                        }
+                        if (defined($namesort{$lastname}{$firstname})) {
+                            push @{$namesort{$lastname}{$firstname}}, $idx;
+                        } else {
+                            @{$namesort{$lastname}{$firstname}} = ("$idx");
+                        }
 			if ($seeid) {
 			    if ($hidden) {
 				$sender.=' <a href="/adm/feedback?unhide='.
@@ -259,15 +347,33 @@ sub list_discussion {
 			    }                     
 			    $sender.=' <a href="/adm/feedback?deldisc='.
 				$ressymb.':::'.$idx;
-                                if ($newpostsflag) {
-                                    $sender .= '&previous='.$prevread;
-                                }
-                                $sender .= '">'.&mt('Delete').'</a>';
+                            if ($newpostsflag) {
+                                $sender .= '&previous='.$prevread;
+                            }
+                            $sender .= '">'.&mt('Delete').'</a>';
 			}
 		    } else {
 			if ($screenname) {
 			    $sender='<i>'.$screenname.'</i>';
 			}
+# Set up for sorting by domain, then username for anonymous
+                        unless (defined($usernamesort{'__anon'})) {
+                            %{$usernamesort{'__anon'}} = ();
+                        }
+                        if (defined($usernamesort{'__anon'}{'__anon'})) {
+                            push @{$usernamesort{'__anon'}{'__anon'}}, $idx;
+                        } else {
+                            @{$usernamesort{'__anon'}{'__anon'}} = ("$idx");
+                        }
+# Set up for sorting by last name, then first name for anonymous
+                        unless (defined($namesort{'__anon'})) {
+                            %{$namesort{'__anon'}} = ();
+                        }
+                        if (defined($namesort{'__anon'}{'__anon'})) {
+                            push @{$namesort{'__anon'}{'__anon'}}, $idx;
+                        } else {
+                            @{$namesort{'__anon'}{'__anon'}} = ("$idx");
+                        }
 		    }
 		    if (&discussion_open($status) &&
 			&Apache::lonnet::allowed('pch',
@@ -287,15 +393,63 @@ sub list_discussion {
 		    }
 #figure out at what position this needs to print
 		    my $thisindex=$idx;
-		    if ($ENV{'environment.threadeddiscussion'}) {
-			$thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);	
+		    if ( (($ENV{'environment.threadeddiscussion'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread')) {
+			$thisindex=$origindex.substr('00'.$replies[$depth[$idx]],-2,2);
 		    }
 		    $alldiscussion{$thisindex}=$idx;
-		    $index[$idx]=$thisindex;
+                    $shown{$idx} = 0;
+                    $index[$idx]=$thisindex;
                     my $spansize = 2;
                     if ($showonlyunread && $prevread > $posttime) {
                         $notshown{$idx} = 1;
                     } else {
+                        my $uname = $contrib{$idx.':sendername'};
+                        my $udom = $contrib{$idx.':senderdomain'};
+                        my $poster = $uname.':'.$udom;
+                        my $rolematch = '';
+                        my $skiptest = 1;
+                        if ($totposters > 0) {
+                            if (grep/^$poster$/,@posters) {
+                                $shown{$idx} = 1;
+                            }
+                        } else {
+                            if ($rolefilter) {
+                                if ($rolefilter eq 'all') {
+                                    $rolematch = '([^:]+)';
+                                } else {
+                                    $rolematch = $rolefilter;
+                                    $skiptest = 0;
+                                }
+                            }
+                            if ($sectionpick) {
+                                if ($sectionpick eq 'all') {
+                                    $rolematch .= ':([^:]*)';
+                                } else {
+                                    $rolematch .= ':'.$sectionpick;
+                                    $skiptest = 0;
+                                }
+                            }
+                            if ($statusfilter) {
+                                if ($statusfilter eq 'all') {
+                                    $rolematch .= ':([^:]+)';
+                                } else {
+                                    $rolematch .= ':'.$statusfilter;
+                                    $skiptest = 0;
+                                }
+                            }
+                            if ($skiptest) {
+                                $shown{$idx} = 1;
+                            } else {
+                                foreach my $role (@{$roleinfo{$poster}}) {
+                                    if ($role =~ m/^$rolematch$/) {
+                                        $shown{$idx} = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    unless ($notshown{$idx} == 1) {
                         if ($prevread > 0 && $prevread <= $posttime) {
                             $newitem{$idx} = 1;
                             $discussionitems[$idx] .= '
@@ -324,78 +478,93 @@ sub list_discussion {
     my $color = &Apache::loncommon::designparm($function.'.tabbg',
                                                     $ENV{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
-        'cuse' => 'Current settings for this discussion',
+        'cuse' => 'Current discussion settings',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'ondisp' => 'Once displayed',
         'onmark' => 'Once marked read',
         'disa' => 'Posts to be displayed',
         'npce' => 'Posts cease to be marked "NEW"',
-        'chgt' => 'Change to ',
+        'chgt' => 'Change',
+        'disp' => 'Display',
+        'nolo' => 'Not new',
     );
 
     my $currdisp = $lt{'allposts'};
     my $currmark = $lt{'onmark'};
     my $dispchange = $lt{'unread'};
     my $markchange = $lt{'ondisp'};
-    my $displink = '/adm/feedback?onlyunread='.$ressymb;
-    my $marklink = '/adm/feedback?markondisp='.$ressymb;
+    my $chglink = '/adm/feedback?modifydisp='.$ressymb;
+    my $displink = 'onlyunread';
+    my $marklink = 'markondisp';
 
     if ($markondisp) {
         $currmark = $lt{'ondisp'};
         $markchange = $lt{'onmark'};
-        $marklink = '/adm/feedback?markonread='.$ressymb;
-        if ($newpostsflag) {
-            $marklink .= '&previous='.$prevread;
-        }
+        $marklink = 'markonread';
     }
 
     if ($showonlyunread) {
         $currdisp = $lt{'unread'};
         $dispchange = $lt{'allposts'};
-        $displink = '/adm/feedback?allposts='.$ressymb;
+        $displink = 'allposts';
     }
+   
+    $chglink .= '&changes='.$displink.'_'.$marklink;
 
     if ($newpostsflag) {
-        $displink .= '&previous='.$prevread;
+        $chglink .= '&previous='.$prevread;
     }
 
     if ($visible) {
 # Print the discusssion
-	$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
-	my $colspan=$maxdepth+1;
-        $discussion .= '<tr bgcolor="#FFFFFF"><td colspan="'.$colspan.'" valign="top">'.
-        '<table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">'.
-        '<tr><td align="left"><b>'.$lt{'cuse'}.'</b></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td align="right"><b>'.$lt{'chgt'}.'</b></td></tr>'.
-        '<tr><td>'.$lt{'disa'}.':&nbsp;<i>'.$currdisp.'</i></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td align="right"><a href="'.$displink.'">'.$dispchange.'</a></td></tr>'.
-        '<tr><td>'.$lt{'npce'}.':&nbsp;<i>'.$currmark.'</i></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td align="right"><a href="'.$marklink.'">'.$markchange.'</a></td></tr>'.
-        '</table></td></tr>'.
-        '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
-        '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
-        if ($visible>2) {
-	    $discussion.='<td align="left">'.
-            '<a href="/adm/feedback?threadedon='.$ressymb;
-            if ($newpostsflag) {
-                $discussion .= '&previous='.$prevread;
+	if ($outputtarget ne 'tex') {
+            my $colspan=$maxdepth+1;
+	    $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+	    $discussion .='<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
+		'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+	    if ($visible>2) {
+		$discussion.='<td align="left">'.
+		    '<a href="/adm/feedback?threadedon='.$ressymb;
+		if ($newpostsflag) {
+		    $discussion .= '&previous='.$prevread;
+		}
+		$discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
+		    '<a href="/adm/feedback?threadedoff='.$ressymb;
+		if ($newpostsflag) {
+		    $discussion .= '&previous='.$prevread;
+		}
+		$discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
+                              <a href= "/adm/feedback?sortfilter='.$ressymb;
+                if ($newpostsflag) {
+                    $discussion .= '&previous='.$prevread;
+                }
+                $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
+            } else {
+                $discussion .= '<td align="left">';
             }
-            $discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
-            '<a href="/adm/feedback?threadedoff='.$ressymb;
+            $discussion .='<a href= "/adm/feedback?export='.$ressymb;
             if ($newpostsflag) {
                 $discussion .= '&previous='.$prevread;
             }
-            $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;</td>';
-	} 
-        if ($newpostsflag) {
-            if (!$markondisp) {
-                $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark new posts as read').'</a>&nbsp;&nbsp;';
-            } else {
-                $discussion .= '<td>&nbsp;</td>';
-            }
-        } else {
-            $discussion .= '<td>&nbsp;</td>';
-        }
-        $discussion .= '</tr></table></td></tr>';
-
+            $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
+	    if ($newpostsflag) {
+		if (!$markondisp) {
+		    $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark new posts as read').'</a>&nbsp;&nbsp;';
+		} else {
+		    $discussion .= '<td>&nbsp;</td>';
+		}
+	    } else {
+		$discussion .= '<td>&nbsp;</td>';
+	    }
+	    $discussion .= '</tr></table></td></tr>';
+	} else {
+	    $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
+                         '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'.
+                         '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'.
+                         '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'.
+                         '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}';
+	}
         my $numhidden = keys %notshown;
         if ($numhidden > 0) {
             my $colspan = $maxdepth+1;
@@ -408,20 +577,111 @@ sub list_discussion {
                          $numhidden.' '.&mt('previously viewed posts').
                          '<br/></td></tr>';
         }
-	foreach (sort { $a <=> $b } keys %alldiscussion) {
-            unless ($notshown{$alldiscussion{$_}} eq '1') {
-	        $discussion.="\n<tr>";
+
+# Choose sort mechanism
+        my @showposts = ();
+        if ($sortposts eq 'descdate') {
+            @showposts = (sort { $b <=> $a } keys %alldiscussion);
+        } elsif ($sortposts eq 'thread') {
+            @showposts = (sort { $a <=> $b } keys %alldiscussion);
+        } elsif ($sortposts eq 'subject') {
+            foreach (sort keys %subjectsort) {
+                push @showposts, @{$subjectsort{$_}};
+            }
+        } elsif ($sortposts eq 'username') {
+            foreach my $domain (sort keys %usernamesort) {
+                foreach (sort keys %{$usernamesort{$domain}}) {
+                    push @showposts, @{$usernamesort{$domain}{$_}};
+                }
+            }
+        } elsif ($sortposts eq 'lastfirst') {
+            foreach my $last (sort keys %namesort) {
+                 foreach (sort keys %{$namesort{$last}}) {
+                     push @showposts, @{$namesort{$last}{$_}};
+                 }
+            }
+        } else {
+            $sortposts = 'ascdate';
+            @showposts =  (sort { $a <=> $b } keys %alldiscussion);
+        }
+        foreach (@showposts) {
+            unless (($sortposts eq 'thread') || ($sortposts eq 'ascdate' && $ENV{'environment.threadeddiscussion'})) {
+                $alldiscussion{$_} = $_;
+            }
+            unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
+                if ($outputtarget ne 'tex') {
+		    $discussion.="\n<tr>";
+		} else {
+		    $discussion.='\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}';
+		}
 	        my $thisdepth=$depth[$alldiscussion{$_}];
-	        for (1..$thisdepth) {
-		    $discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
-	        }
+                if ($outputtarget ne 'tex') {
+		    for (1..$thisdepth) {
+			$discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
+		    }
+		}
 	        my $colspan=$maxdepth-$thisdepth+1;
-                $discussion.='<td  bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].'" colspan="'.$colspan.'">'.
+                if ($outputtarget ne 'tex') {
+		    $discussion.='<td  bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].'" colspan="'.$colspan.'">'.
                              $discussionitems[$alldiscussion{$_}].
 	                     '</td></tr>';
+		} else {
+		    #cleanup block
+		    $discussionitems[$alldiscussion{$_}]=~s/<table([^>]*)>/<table TeXwidth="90 mm">/;
+		    $discussionitems[$alldiscussion{$_}]=~s/<tr([^>]*)><td([^>]*)>/<tr><td TeXwidth="20 mm" align="left">/;
+                    my $threadinsert='';
+                    if ($thisdepth > 0) {
+			$threadinsert='<br /><strong>Reply: '.$thisdepth.'</strong>';
+		    }
+		    $discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
+		    $discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Hide|Delete|Reply|Submissions)<\/a>//g;
+                    $discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
+		    
+                    #FIXME xmlparse can't be safely called from inside xmlparse
+                    #   due to the global variables that are use, the safe
+                    #   space etc. I expect this has unforseen issues that
+                    #   need resolving.
+		    
+                    $discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]);
+		}
 	    }
         }
-        $discussion.='</table><br /><br />';
+	if ($outputtarget ne 'tex') {
+            my $colspan=$maxdepth+1;
+            $discussion .= <<END; 
+            <tr bgcolor="#FFFFFF">
+             <td colspan="$colspan" valign="top">
+              <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+               <tr>
+                <td align="left">
+                 <table border="0" cellpadding="0" cellspacing="4">
+                  <tr>
+                   <td>
+                    <font size="-1"><b>$lt{'cuse'}</b>:</td>
+                   <td>&nbsp;</td>
+END
+            if ($newpostsflag) {
+                $discussion .= 
+                   '<td><font size="-1">1.&nbsp;'.$lt{'disp'}.'&nbsp;-&nbsp;<i>'.$currdisp.'</i>&nbsp;&nbsp;2.&nbsp;'.$lt{'nolo'}.'&nbsp;-&nbsp;<i>'.$currmark.'</i></font></td>';
+            } else {
+                $discussion .=
+                   '<td><font size="-1">'.$lt{'disp'}.'&nbsp;-&nbsp;<i>'.$currdisp.'</i></font></td>';
+            }
+            $discussion .= <<END;
+                   <td>&nbsp;</td>
+                   <td>
+                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b></td>
+                  </tr>
+                 </table>
+                </td>
+               </tr>
+              </table>
+             </td>
+            </tr>
+           </table>
+           <br /><br />
+END
+	}
     }
     if ($discussiononly) {
 	$discussion.=(<<ENDDISCUSS);
@@ -440,17 +700,21 @@ Attachment (128 KB max size): <input typ
 </p>
 </form>
 ENDDISCUSS
-      $discussion.=&generate_preview_button();
+        if ($outputtarget ne 'tex') {
+	    $discussion.=&generate_preview_button();
+	}
     } else {
 	if (&discussion_open($status) &&
 	    &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>';
-			}
+	    if ($outputtarget ne 'tex') {
+		$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;
 }
@@ -571,6 +835,380 @@ $r->print(&generate_preview_button().
 '</body></html>');
 }
 
+sub print_display_options {
+    my ($r,$symb,$previous,$dispchg,$markchg,$feedurl) = @_;
+ # backward compatibility (bulletin boards used to be 'wrapped')
+    if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+        $feedurl=~s|^/adm/wrapper||;
+    }
+
+    my $function = &Apache::loncommon::get_users_function();
+    my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
+                                                    $ENV{'user.domain'});
+    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
+                                          '','');
+
+    my %lt = &Apache::lonlocal::texthash(
+        'dido' => 'Discussion display options',
+        'pref' => 'Display Preference',
+        'curr' => 'Current setting ',
+        'actn' => 'Action',
+        'deff' => 'Default for all discussions',
+        'prca' => 'Preferences can be set for this discussion that determine ....',
+        'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+        'unwh' => 'Under what circumstances posts are identfied as "New."',
+        'allposts' => 'All posts',
+        'unread' => 'New posts only',
+        'ondisp' => 'Once displayed',
+        'onmark' => 'Once marked as read',
+        'disa' => 'Posts displayed?',
+        'npmr' => 'New posts cease to be identified as "New"?',
+        'chgt' => 'Change to ',
+        'mkdf' => 'Set to ',
+        'yhni' => 'You have not indicated that you wish to change either of the discussion settings',
+        'ywbr' => 'You will be returned to the previous page if you click OK.'
+    );
+
+    my $dispchange = $lt{'unread'};
+    my $markchange = $lt{'ondisp'};
+    my $currdisp = $lt{'allposts'};
+    my $currmark = $lt{'onmark'};
+    my $discdisp = 'allposts';
+    my $discmark = 'onmark';
+                                                                                      
+    if ($dispchg eq 'allposts') {
+        $dispchange = $lt{'allposts'};
+        $currdisp = $lt{'unread'};
+        $discdisp = 'unread';
+    }
+                                                                                      
+    if ($markchg eq 'markonread') {
+        $markchange = $lt{'onmark'};
+        $currmark = $lt{'ondisp'};
+        $discmark = 'ondisp';
+    }
+    $r->print(<<END);
+<html>
+<head>
+<title>$lt{'dido'}</title>
+<meta http-equiv="pragma" content="no-cache" />
+<script>
+function setDisp() {
+    var prev = "$previous"
+    var chktotal = 0
+    if (document.modifydisp.discdisp.checked == true) {
+        document.modifydisp.$dispchg.value = "$symb"
+        chktotal ++
+    }
+    if (document.modifydisp.discmark.checked == true) {
+        document.modifydisp.$markchg.value = "$symb"
+        chktotal ++
+    }
+    if (chktotal > 0) { 
+        document.modifydisp.submit()
+    } else {
+        if(confirm("$lt{'yhni'}. \\n$lt{'ywbr'}"))      {
+            if (prev > 0) {
+                location.href = "$feedurl?previous=$previous"
+            } else {
+                location.href = "$feedurl"
+            }
+        }
+    }
+}
+</script>
+</head>
+$bodytag
+<form name="modifydisp" method="post" action="/adm/feedback">
+$lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
+<br />
+<table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+  <td width="100%" bgcolor="#000000">
+   <table width="100%" border="0" cellpadding="1" cellspacing="0">
+    <tr>
+     <td width="100%" bgcolor="#000000">
+      <table border="0" cellpadding="3" cellspacing="1" bgcolor="#FFFFFF">
+       <tr bgcolor="$tabcolor">
+        <td><b>$lt{'pref'}</b></td>
+        <td><b>$lt{'curr'}</b></td>
+        <td><b>$lt{'actn'}?</b></td>
+       </tr>
+       <tr bgcolor="#dddddd">
+       <td>$lt{'disa'}</td>
+       <td>$lt{$discdisp}</td>
+       <td><input type="checkbox" name="discdisp" />&nbsp;$lt{'chgt'} "$dispchange"</td>
+      </tr><tr bgcolor="#eeeeee">
+       <td>$lt{'npmr'}</td>
+       <td>$lt{$discmark}</td>
+       <td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+  </table>
+ </td>
+</tr>
+</table>
+<br />
+<br />
+<input type="hidden" name="previous" value="$previous" />
+<input type="hidden" name="$dispchg" value=""/>
+<input type="hidden" name="$markchg" value=""/>
+<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+<br />
+<br />
+</form>
+</body>
+</html>
+END
+    return;
+}
+
+sub print_sortfilter_options {
+    my ($r,$symb,$previous,$feedurl) = @_;
+ # backward compatibility (bulletin boards used to be 'wrapped')
+    if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+        $feedurl=~s|^/adm/wrapper||;
+    }
+    my @sections = ();
+    my $section_sel = '';
+    my $numsections = 0;
+    my $numvisible = 5;
+    my ($classlist) = &Apache::loncoursedata::get_classlist(
+                              $ENV{'request.course.id'},
+                              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+                              $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+                                                                                   
+    my $sec_index = &Apache::loncoursedata::CL_SECTION();
+    my $status_index = &Apache::loncoursedata::CL_STATUS();
+    my %sectioncount = ();
+    while (my ($student,$data) = each %$classlist) {
+        my ($section,$status) = ($data->[$sec_index],
+                                 $data->[$status_index]);
+        unless ($section eq '' || $section =~ /^\s*$/) {
+            if (!defined($sectioncount{$section})) {
+                $sectioncount{$section} = 1;
+                $numsections ++;
+            } else {
+                $sectioncount{$section} ++;
+            }
+        }
+    }
+                                                                                   
+    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
+        @sections = ($ENV{'request.course.sec'});
+        $numvisible = 1;
+    } else {
+        @sections = sort {$a cmp $b} keys(%sectioncount);
+        unshift(@sections,'all'); # Put 'all' at the front of the list
+        if ($numsections < 4) {
+            $numvisible = $numsections + 1;
+        }
+    }
+    foreach (@sections) {
+        $section_sel .= "  <option value=\"$_\" />$_\n";
+    }
+                                                                                   
+    my $function = &Apache::loncommon::get_users_function();
+    my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
+                                                    $ENV{'user.domain'});
+    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
+                                          '','');
+    my %lt = &Apache::lonlocal::texthash(
+        'diso' => 'Discussion sorting and filtering options',
+        'diop' => 'Display Options',
+        'curr' => 'Current setting ',
+        'actn' => 'Action',
+        'prca' => 'Options can be set that control the sort order of the posts, in addition to which posts are displayed.',
+        'soor' => 'Sort order',
+        'disp' => 'Specific user roles',
+        'actv' => 'Specific role status',
+        'spse' => 'Specific sections',
+        'psub' => 'Pick specific users (by name)',
+        'shal' => 'Show a list of current posters'
+    );
+    $r->print(<<END);
+<html>
+<head>
+<title>$lt{'diso'}</title>
+<meta http-equiv="pragma" content="no-cache" />
+</head>
+$bodytag
+<form name="modifyshown" method="post" action="/adm/feedback">
+<b>$lt{'diso'}</b><br/> $lt{'prca'}
+<br /><br />
+<table border="0">
+ <tr>
+  <td><b>$lt{'soor'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'disp'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'actv'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'spse'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'psub'}</b></td>
+ </tr>
+ <tr>
+  <td>
+   <select name="sortposts">
+    <option value="ascdate" />Date order - oldest first
+    <option value="descdate" />Date order - newest first
+    <option value="thread" />Threaded
+    <option value="subject" />By subject
+    <option value="username" />By domain and username
+    <option value="lastfirst" />By last name, first name
+   </select>
+  </td>
+  <td>&nbsp;</td>
+  <td>
+   <select name="rolefilter" multiple="true" size="5">
+    <option value="all" />All users
+    <option value="st" />Students
+    <option value="cc" />Course Coordinators
+    <option value="in" />Instructors
+    <option value="ta" />TAs
+    <option value="pr" />Exam proctors
+    <option value="cr" />Custom roles
+   </select>
+  </td>
+  <td>&nbsp;</td>
+  <td>
+   <select name="statusfilter">
+    <option value="all" />Roles of any status
+    <option value="Active" />Only active roles
+    <option value="Expired" />Only inactive roles
+   </select>
+  </td>
+  <td>&nbsp;</td>
+  <td>
+   <select name="sectionpick" multiple="true" size="$numvisible">
+    $section_sel
+   </select>
+  </td>
+  <td>&nbsp;</td>
+  <td><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</td>
+ </tr>
+</table>
+<br />
+<br />
+<input type="hidden" name="previous" value="$previous" />
+<input type="hidden" name="applysort" value="$symb" />
+<input type="button" name="sub" value="Store Changes" onClick="javascript:document.modifyshown.submit()" />
+<br />
+<br />
+</form>
+</body>
+</html>
+END
+}
+
+sub print_showposters {
+    my ($r,$symb,$previous,$feedurl,$sortposts) = @_;
+ # backward compatibility (bulletin boards used to be 'wrapped')
+    if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+        $feedurl=~s|^/adm/wrapper||;
+    }
+# backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb=$symb;
+    if ($ressymb =~ /bulletin___\d+___/) {
+        unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+            $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+        }
+    }
+    my $crs='/'.$ENV{'request.course.id'};
+    $crs=~s/\_/\//g;
+    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    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 %namesort = ();
+    my %postcounts = ();
+    my %lt=&Apache::lonlocal::texthash(
+                     'diso' => 'Discussion filtering options',
+    );
+    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
+                                          '','');
+    if ($contrib{'version'}) {
+        for (my $idx=1;$idx<=$contrib{'version'};$idx++) {
+            my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+            my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+            unless ((($hidden) && (!$seeid)) || ($deleted)) {
+                if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+                    my %names = &Apache::lonnet::get('environment',['firstname','lastname'],$contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+                    my $lastname = $names{'lastname'};
+                    my $firstname = $names{'firstname'};
+                    if ($lastname eq '') {
+                        $lastname = '_';
+                    }
+                    if ($firstname eq '') {
+                        $firstname = '_';
+                    }
+                    unless (defined($namesort{$lastname})) {
+                        %{$namesort{$lastname}} = ();
+                    }
+                    my $poster =  $contrib{$idx.':sendername'}.':'.$contrib{$idx.':senderdomain'};
+                    $postcounts{$poster} ++;
+                    if (defined($namesort{$lastname}{$firstname})) {
+                        if (!grep/^$poster$/,@{$namesort{$lastname}{$firstname}}) {
+                            push @{$namesort{$lastname}{$firstname}}, $poster;
+                        }
+                    } else {
+                        @{$namesort{$lastname}{$firstname}} = ("$poster");
+                    }
+                }
+            }
+        }
+    }
+    $r->print(<<END);
+<html>
+<head>
+<title>$lt{'diso'}</title>
+<meta http-equiv="pragma" content="no-cache" />
+</head>
+$bodytag
+ <form name="pickpostersform" method="post">
+  <table border="0">
+   <tr>
+    <td bgcolor="#777777">
+     <table border="0" cellpadding="3">
+      <tr bgcolor="#e6ffff">
+       <td><b>No.</b></td>
+       <td><b>Select</b></td>
+       <td><b>Fullname</b><font color="#999999">(Username/domain)</font></td>
+       <td><b>Posts</td>
+      </tr>
+END
+    my $count = 0;
+    foreach my $last (sort keys %namesort) {
+        foreach my $first (sort keys %{$namesort{$last}}) {
+            foreach (sort @{$namesort{$last}{$first}}) {
+                my ($uname,$udom) = split/:/,$_;
+                if (!$uname || !$udom) { 
+                    next;
+                } else {
+                    $count ++;
+                    $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</td><td>'.$postcounts{$_}.'</td></tr>');
+                }
+            }
+        }
+    }
+    $r->print(<<END);
+     </table>
+    </td>
+   </tr>
+  </table>
+<br />
+<input type="hidden" name="sortposts" value="$sortposts" />
+<input type="hidden" name="userpick" value="$symb" />
+<input type="button" name="store" value="Display posts" onClick="javascript:document.pickpostersform.submit()" />
+</form>
+</body>
+</html>
+END
+}
+
 sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
@@ -589,9 +1227,18 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous) = @_;
-  my $prevtag = '';
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$secpick,$numpicks) = @_;
+  my $sorttag = '';
+  my $roletag = '';
+  my $statustag = '';
+  my $sectag = '';
+  my $userpicktag = '';
   my $qrystr = '';
+  my $prevtag = '';
+ # backward compatibility (bulletin boards used to be 'wrapped')
+  if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+      $feedurl=~s|^/adm/wrapper||;
+  }
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   if ($previous > 0) {
       $qrystr = 'previous='.$previous;
@@ -602,6 +1249,28 @@ sub redirect_back {
       }
       $prevtag = '<input type="hidden" name="previous" value="'.$previous.'" />';
   }
+  if (defined($sort)) {
+      my $sortqry = 'sortposts='.$sort;
+      if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) {
+          $feedurl .= '&'.$sortqry;
+      } else {
+          $feedurl .= '?'.$sortqry;
+      }
+      $sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
+      if ( (defined($numpicks)) && ($numpicks > 0) ) {
+          my $userpickqry = 'totposters='.$numpicks;
+          $feedurl .= '&'.$userpickqry;
+          $userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
+      } else {
+          my $roleqry = 'rolefilter='.$rolefilter;
+          $feedurl .= '&'.$roleqry;
+          $roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
+          $feedurl .= '&statusfilter='.$statusfilter;
+          $statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
+          $feedurl .= '&sectionpick='.$secpick;
+          $sectag = '<input type="hidden" name="sectionpick" value="'.$secpick.'" />';
+      }
+  }
   $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -616,6 +1285,11 @@ $typestyle
 <font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">
 $prevtag
+$sorttag
+$statustag
+$roletag
+$sectag
+$userpicktag
 </form>
 </body>
 </html>
@@ -931,58 +1605,194 @@ 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','onlyunread','allposts','previous','markread','markonread','markondisp']);
-
-  if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {
-# ---------------------- Modify setting for identification of 'NEW' posts in this discussion
-
+  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp','modifydisp','changes','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick']);
+  if ($ENV{'form.posterlist'}) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};
-      my $ressymb = $symb;
+      my $symb=$ENV{'form.posterlist'};
+      my $sortposts = $ENV{'form.sortposts'};
       my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      my $previous=$ENV{'form.previous'};
+      my $feedurl = &Apache::lonnet::clutter($url);
+ # backward compatibility (bulletin boards used to be 'wrapped')
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+          $feedurl=~s|^/adm/wrapper||;
+      }
+      &print_showposters($r,$symb,$previous,$feedurl,$sortposts);
+      return OK;
+  }
+  if ($ENV{'form.userpick'}) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $symb=$ENV{'form.userpick'};
+      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      my $previous=$ENV{'form.previous'};
+# backward compatibility (bulletin boards used to be 'wrapped')
+      my $ressymb=$symb;
       unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
           $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
       }
-                                                                                          
-      my %discinfo = ();
-      my $lastkey = $ressymb.'_lastread';
-      my $ondispkey = $ressymb.'_markondisp';
-      if ($ENV{'form.markondisp'}) {
-          $discinfo{$lastkey} = time;
-          $discinfo{$ondispkey} = 1;
-      } elsif ($ENV{'form.markonread'}) {
-          if ( defined($ENV{'previous'}) ) {
-              $discinfo{$lastkey} = $ENV{'previous'};
-          }
-          $discinfo{$ondispkey} = 0;
-      }
-      &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
-      if ($ENV{'form.markondisp'}) {
-          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0');
+      my $sort=$ENV{'form.sortposts'};
+      my @posters = ();
+      if (ref($ENV{'form.stuinfo'}) eq 'ARRAY') {
+          @posters = $ENV{'form.stuinfo'};
       } else {
-          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'});
+          $posters[0] = $ENV{'form.stuinfo'};
+      }
+      my $numpicks = @posters;
+      if (defined($ENV{'form.userpick'})) {
+          my %discinfo = ();
+          $discinfo{$ressymb.'_userpick'} = join('&',@posters);
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
       }
+      my $feedurl = &Apache::lonnet::clutter($url);
+ # backward compatibility (bulletin boards used to be 'wrapped')
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+          $feedurl=~s|^/adm/wrapper||;
+      }
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',$previous,$sort,'','','',$numpicks);
       return OK;
-  } elsif (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
-# ----------------------------------------------------------------- Modify display setting for this discussion 
+  }
+  if ($ENV{'form.applysort'}) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
-      my $ressymb = $symb;
+      my $symb=$ENV{'form.applysort'};
       my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-      unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
-          $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+      my $previous=$ENV{'form.previous'};
+      my $sort = $ENV{'form.sortposts'};
+      my $rolefilter = $ENV{'form.rolefilter'};
+      my $statusfilter = $ENV{'form.statusfilter'};
+      my $secpick = $ENV{'form.sectionpick'};
+      my $feedurl = &Apache::lonnet::clutter($url);
+ # backward compatibility (bulletin boards used to be 'wrapped')
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+          $feedurl=~s|^/adm/wrapper||;
+      }
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',$previous,$sort,$rolefilter,$statusfilter,$secpick);
+      return OK;
+  } elsif ($ENV{'form.sortfilter'}) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $symb=$ENV{'form.sortfilter'};
+      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      my $previous=$ENV{'form.previous'};
+      my $feedurl = &Apache::lonnet::clutter($url);
+ # backward compatibility (bulletin boards used to be 'wrapped')
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+          $feedurl=~s|^/adm/wrapper||;
       }
+      &print_sortfilter_options($r,$symb,$previous,$feedurl);
+      return OK;
+  } elsif ($ENV{'form.navmaps'}) {
       my %discinfo = ();
-      if ($ENV{'form.allposts'}) {
-          $discinfo{$ressymb.'_showonlyunread'} = 0;
-      } elsif ($ENV{'form.onlyunread'}) {
-          $discinfo{$ressymb.'_showonlyunread'} = 1;
+      my @resources = ();
+      if ($ENV{'form.navmaps'} =~ /:/) {
+          @resources = split/:/,$ENV{'form.navmaps'};
+      } else {
+          @resources = ("$ENV{'form.navmaps'}");
+      }
+      my $numitems = @resources;
+      my $feedurl = '/adm/navmaps';
+      if ($ENV{'form.navurl'}) {
+          $feedurl .= '?'.$ENV{'form.navurl'};
+      }
+      my %lt = &Apache::lonlocal::texthash(
+          'mnpa' => 'Marked "New" posts as read in a total of',
+          'robb' => 'resources/bulletin boards.'
+      );       
+      foreach (@resources) {
+# backward compatibility (bulletin boards used to be 'wrapped')
+          my $ressymb=$_;
+          if ($ressymb =~ m/bulletin___\d+___/) {
+              unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+                  $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper/|;
+              }
+          }
+          my $lastkey = $ressymb.'_lastread';
+          $discinfo{$lastkey} = time;
       }
       &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
-      &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'});
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      $r->print (<<ENDREDIR);
+<html>
+<head>
+<title>New posts marked as read</title>
+<meta http-equiv="pragma" content="no-cache" />
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
+</head>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
+</body>
+</html>
+ENDREDIR
+      return OK;
+  } elsif ($ENV{'form.modifydisp'}) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $symb=$ENV{'form.modifydisp'};
+      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      my $previous=$ENV{'form.previous'};
+      my ($dispchg,$markchg) = split/_/,$ENV{'form.changes'};
+      my $feedurl = &Apache::lonnet::clutter($url);
+ # backward compatibility (bulletin boards used to be 'wrapped')  
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+          $feedurl=~s|^/adm/wrapper||;
+      }
+      &print_display_options($r,$symb,$previous,$dispchg,$markchg,$feedurl);
+      return OK;
+  } elsif (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $previous=$ENV{'form.previous'};
+      my ($map,$ind,$url);
+      if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {
+# ---------------------- Modify setting for identification of 'NEW' posts in this discussion
+          my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};
+          my $ressymb = $symb;
+          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+          unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+              $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+          }
+          my %discinfo = ();
+          my $lastkey = $ressymb.'_lastread';
+          my $ondispkey = $ressymb.'_markondisp';
+          if ($ENV{'form.markondisp'}) {
+              $discinfo{$lastkey} = time;
+              $discinfo{$ondispkey} = 1;
+          } elsif ($ENV{'form.markonread'}) {
+              if ( $previous > 0 ) {
+                  $discinfo{$lastkey} = $previous;
+              }
+              $discinfo{$ondispkey} = 0;
+          }
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      }
+      if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
+# ----------------------------------------------------------------- Modify display setting for this discussion 
+          my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
+          my $ressymb = $symb;
+          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+          unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+              $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+          }
+          my %discinfo = ();
+          if ($ENV{'form.allposts'}) {
+              $discinfo{$ressymb.'_showonlyunread'} = 0;
+          } elsif ($ENV{'form.onlyunread'}) {
+              $discinfo{$ressymb.'_showonlyunread'} = 1;
+          }
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      }
+      if (($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
+          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$previous);
+      } else {
+          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0');
+      }
       return OK;
   } elsif ($ENV{'form.markread'}) {
 # ----------------------------------------------------------------- Mark new posts as read
@@ -1103,7 +1913,7 @@ sub handler {
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
   }
-  # backward compatibility (bulltin boards used to be 'wrapped')
+  # backward compatibility (bulletin boards used to be 'wrapped')
   if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
       $feedurl=~s|^/adm/wrapper||;
   }