--- loncom/interface/lonfeedback.pm	2004/11/11 22:47:55	1.130
+++ loncom/interface/lonfeedback.pm	2005/02/17 04:11:20	1.151
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.130 2004/11/11 22:47:55 albertel Exp $
+# $Id: lonfeedback.pm,v 1.151 2005/02/17 04:11:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,13 +68,18 @@ sub discussion_visible {
 }
 
 sub list_discussion {
-    my ($mode,$status,$symb)=@_;
+    my ($mode,$status,$ressymb,$imsextras)=@_;
     my $outputtarget=$ENV{'form.grade_target'};
     if (defined($ENV{'form.export'})) {
 	if($ENV{'form.export'}) {
             $outputtarget = 'export';
         }
-    }    
+    }
+    if (defined($imsextras)) {
+        if ($$imsextras{'caller'} eq 'imsexport') {
+            $outputtarget = 'export';
+        }
+    }
     if (not &discussion_visible($status)) { return ''; }
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
@@ -84,23 +89,19 @@ sub list_discussion {
     my $cid=$ENV{'request.course.id'};
     if ($ENV{'request.course.sec'}) {
 	$crs.='_'.$ENV{'request.course.sec'};
-    }                 
-    $crs=~s/\_/\//g;
-    unless ($symb) {
-	$symb=&Apache::lonnet::symbread();
     }
-    unless ($symb) { return ''; }
+    $crs=~s/\_/\//g;
+    unless ($ressymb) {	$ressymb=&Apache::lonnet::symbread(); }
+    unless ($ressymb) { return ''; }
+    $ressymb=&wrap_symb($ressymb);
+    my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
+    my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
+		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form)$/));
+    
     my %usernamesort = ();
     my %namesort =();
     my %subjectsort = ();
-# 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|;
-        }
-    }
-    $ressymb=&Apache::lonenc::check_encrypt($ressymb);
+
 # Get discussion display settings for this discussion
     my $lastkey = $ressymb.'_lastread';
     my $showkey = $ressymb.'_showonlyunread';
@@ -110,7 +111,7 @@ sub list_discussion {
     my $userpickkey = $ressymb.'_userpick';
     my $toggkey = $ressymb.'_readtoggle';
     my $readkey = $ressymb.'_read';
-
+    $ressymb=$encsymb;
     my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$markkey,$visitkey,$ondispkey,$userpickkey,$toggkey,$readkey],$ENV{'user.domain'},$ENV{'user.name'});
     my %discinfo = ();
     my $showonlyunread = 0;
@@ -125,9 +126,19 @@ sub list_discussion {
 # Retain identification of "NEW" posts identified in last display, if continuing 'previous' browsing of posts.
     &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 @sectionpick = ();
+    if ($ENV{'form.sectionpick'} =~ /,/) {
+        @sectionpick = split/,/,$ENV{'form.sectionpick'};
+    } else {
+        $sectionpick[0] = $ENV{'form.sectionpick'};
+    }
+    my @rolefilter = ();
+    if ($ENV{'form.rolefilter'} =~ /,/) {
+        @rolefilter = split/,/,$ENV{'form.rolefilter'};
+    } else {
+        $rolefilter[0] = $ENV{'form.rolefilter'};
+    }
     my $totposters = $ENV{'form.totposters'};
     $previous = $ENV{'form.previous'};
     if ($previous > 0) {
@@ -141,17 +152,22 @@ sub list_discussion {
 # Get information about students and non-students in course for filtering display of posts
     my %roleshash = ();
     my %roleinfo = ();
-    if ($rolefilter) {
+    if ($ENV{'form.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/:/,$_;
+            if ($role =~ /^cr/) {
+                $role = 'cr';
+            }
             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;
+            if ($uname && $udom) { 
+                push @{$roleinfo{$uname.':'.$udom}}, $role.':'.$sec.':'.$status;
+            }
         }
         my ($classlist) = &Apache::loncoursedata::get_classlist(
                               $ENV{'request.course.id'},
@@ -204,8 +220,6 @@ sub list_discussion {
     $visit ++;
 
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
-	&& ($symb=~/\.(problem|exam|quiz|assess|survey|form)$/));
     my @discussionitems=();
     my %shown = ();
     my @posteridentity=();
@@ -231,7 +245,7 @@ sub list_discussion {
     $discinfo{$visitkey} = $visit;
 
     &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
-    &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$statusfilter,$toggkey,$outputtarget);
+    &build_posting_display(\%usernamesort,\%subjectsort,\%namesort,\%notshown,\%newitem,\%dischash,\%shown,\%alldiscussion,\%imsitems,\%imsfiles,\%roleinfo,\@discussionitems,\@replies,\@depth,\@posters,\$maxdepth,\$visible,\$newpostsflag,\$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,\@rolefilter,\@sectionpick,$statusfilter,$toggkey,$outputtarget);
 
     my $discussion='';
     my $manifestfile;
@@ -316,15 +330,26 @@ sub list_discussion {
         } elsif ($outputtarget eq 'export') {
 # Create temporary directory if this is an export
             my $now = time;
-            $tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
-            if (!-e $tempexport) {
-                mkdir($tempexport,0700);
-            }
-            $tempexport .= '/'.$now;
-            if (!-e $tempexport) {
-                mkdir($tempexport,0700);
+            if ((defined($imsextras)) && ($$imsextras{'caller'} eq 'imsexport')) {
+                $tempexport = $$imsextras{'tempexport'};
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+                $tempexport .= '/'.$$imsextras{'count'};
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+            } else {
+                $tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+                $tempexport .= '/'.$now;
+                if (!-e $tempexport) {
+                    mkdir($tempexport,0700);
+                }
+                $tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
             }
-            $tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
             if (!-e $tempexport) {
                 mkdir($tempexport,0700);
             }
@@ -361,22 +386,22 @@ imscp_v1p1.xsd http://www.imsglobal.org/
    }
 </script>
             |;
-	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'"><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><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;
+		    '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$ressymb;
 		if ($newpostsflag) {
 		    $discussion .= '&previous='.$prevread;
 		}
 		$discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
-		    '<a href="/adm/feedback?threadedoff='.$ressymb;
+		    '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$ressymb;
 		if ($newpostsflag) {
 		    $discussion .= '&previous='.$prevread;
 		}
 		$discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
-                              <a href= "/adm/feedback?sortfilter='.$ressymb;
+                              <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$ressymb;
                 if ($newpostsflag) {
                     $discussion .= '&previous='.$prevread;
                 }
@@ -391,7 +416,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             $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 no longer new').'</a>&nbsp;&nbsp;';
+		    $discussion .='<td align="right"><a href="/adm/feedback?markread=1&amp;symb='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a>&nbsp;&nbsp;';
 		} else {
 		    $discussion .= '<td>&nbsp;</td>';
 		}
@@ -404,7 +429,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             if ($numhidden > 0) {
                 my $colspan = $maxdepth+1;
                 $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
-                         '<a href="/adm/feedback?allposts='.$ressymb;
+                         '<a href="/adm/feedback?allposts=1&amp;symb='.$ressymb;
                 if ($newpostsflag) {
                     $discussion .= '&previous='.$prevread;
                 }
@@ -442,13 +467,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                  }
             }
         } else {
-            $sortposts = 'ascdate';
             @showposts =  (sort { $a <=> $b } keys %alldiscussion);
         }
         my $currdepth = 0;
         my $firstidx = $alldiscussion{$showposts[0]};
         foreach (@showposts) {
-            unless (($sortposts eq 'thread') || ($sortposts eq 'ascdate' && $ENV{'environment.threadeddiscussion'}) || ($outputtarget eq 'export')) {
+            unless (($sortposts eq 'thread') || (($sortposts eq '') && ($ENV{'environment.threadeddiscussion'})) || ($outputtarget eq 'export')) {
                 $alldiscussion{$_} = $_;
             }
             unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
@@ -488,8 +512,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
         $imsitems{$alldiscussion{$_}}{'isvisible'}.'" identifieref="RES-'.$ressymb.'-'.$alldiscussion{$_}.'">'.
         '<title>'.$imsitems{$alldiscussion{$_}}{'title'}.'</title>';
                         $imsresources .= "\n".
-    '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'.
-      '<file href="'.$alldiscussion{$_}.'.html">'."\n".
+    '<resource identifier="RES-'.$ressymb.'-'.$alldiscussion{$_}.'" type="webcontent" href="'.$postfilename.'">'."\n".
+      '<file href="'.$postfilename.'">'."\n".
       $imsfiles{$alldiscussion{$_}}{$imsitems{$alldiscussion{$_}}{'currversion'}}."\n".
     '</resource>';
                     }
@@ -546,13 +570,54 @@ END
             $discussion .= <<END;
                    </font></td>
                    <td>&nbsp;</td>
-                   <td>
+                   <td align="left">
                     <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
                    </td>
                   </tr>
                  </table>
                 </td>
 END
+            if ($sortposts) {
+                my %sort_types = ();
+                my %role_types = ();
+                my %status_types = ();
+                &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+
+                $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
+                if (defined($ENV{'form.totposters'})) {
+                    $discussion .= &mt('Posts by').':';
+                    if ($totposters > 0) {
+                        foreach my $poster (@posters) {
+                            $poster =~ s/:/\@/;
+                            $discussion .= ' '.$poster.',';
+                        }
+                        $discussion =~ s/,$//;
+                    } else {
+                        $discussion .= &mt('None selected');
+                    }
+                } else {
+                    my $filterchoice ='';
+                    if (@sectionpick > 0) {
+                        $filterchoice = '<i>'.&mt('sections').'</i>-&nbsp;'.$ENV{'form.sectionpick'};
+                        $filterchoice .= '&nbsp;&nbsp;&nbsp; ';
+                    }
+                    if (@rolefilter > 0) {
+                        $filterchoice .= '<i>'.&mt('roles').'</i>-';
+                        foreach (@rolefilter) {
+                            $filterchoice .= '&nbsp;'.$role_types{$_}.',';
+                        }
+                        $filterchoice =~ s/,$//;
+                        $filterchoice .= '<br />&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+                    }
+                    if ($statusfilter) {
+                        $filterchoice .= '<i>'.&mt('status').'</i>-&nbsp;'.$status_types{$statusfilter};
+                    }
+                    if ($filterchoice) {
+                        $discussion .= '<b>'.&mt('Filters').'</b>:&nbsp;'.$filterchoice;
+                    }
+                    $discussion .= '</font></td>';
+                }
+            }
             if ($dischash{$toggkey}) {
                 my $storebutton = &mt('Store read/unread changes');
                 $discussion.='<td align="right">'.
@@ -585,27 +650,31 @@ END
 </manifest>
                 |;
                 close($manifestfile);
+                if ((defined($imsextras)) && ($$imsextras{'caller'} eq 'imsexport')) {
+                    $discussion = $copyresult;
+                } else {
 
 #Create zip file in prtspool
 
-                my $imszipfile = '/prtspool/'.
-                $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-                     time.'_'.rand(1000000000).'.zip';
+                    my $imszipfile = '/prtspool/'.
+                    $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+                         time.'_'.rand(1000000000).'.zip';
     # zip can cause an sh launch which can pass along all of %ENV
     # which can be too large for /bin/sh to handle
-                my %oldENV=%ENV;
-                undef(%ENV);
-                my $cwd = &getcwd(); 
-                my $imszip = '/home/httpd/'.$imszipfile;
-                chdir $tempexport;
-                open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
-                close(OUTPUT);
-                chdir $cwd;
-                %ENV=%oldENV;
-                undef(%oldENV);
-                $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
-                if ($copyresult) {
-                    $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+                    my %oldENV=%ENV;
+                    undef(%ENV);
+                    my $cwd = &getcwd(); 
+                    my $imszip = '/home/httpd/'.$imszipfile;
+                    chdir $tempexport;
+                    open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
+                    close(OUTPUT);
+                    chdir $cwd;
+                    %ENV=%oldENV;
+                    undef(%oldENV);
+                    $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
+                    if ($copyresult) {
+                        $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
+                    }
                 }
             } else {
                 $discussion .= '<br />Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.<br />';
@@ -645,42 +714,42 @@ to course faculty</font><br />
 <b>Title:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
 <textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
 ENDDISCUSS
-        if ($ENV{'form.origpage'}) {
-            $discussion.='<input type="hidden" name="origpage" value="'.$ENV{'form.origpage'}.'" />'."\n";
-            foreach (@currnewattach) {
-                $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
-            }
-        }
-        $discussion.="</form>\n";
-        if ($outputtarget ne 'tex') {
-            $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
-            if (@currnewattach > 0) {
-                $newattachmsg .= '<b>New attachments</b><br />';
-                if (@currnewattach > 1) {
-                    $newattachmsg .= '<ol>';
-                    foreach my $item (@currnewattach) {
-                        $item =~ m#.*/([^/]+)$#;
-                        $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+            if ($ENV{'form.origpage'}) {
+                $discussion.='<input type="hidden" name="origpage" value="'.$ENV{'form.origpage'}.'" />'."\n";
+                foreach (@currnewattach) {
+                    $discussion.='<input type="hidden" name="currnewattach" value="'.$_.'" />'."\n";
+                }
+            }
+            $discussion.="</form>\n";
+            if ($outputtarget ne 'tex') {
+                $discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
+                if (@currnewattach > 0) {
+                    $newattachmsg .= '<b>New attachments</b><br />';
+                    if (@currnewattach > 1) {
+                        $newattachmsg .= '<ol>';
+                        foreach my $item (@currnewattach) {
+                            $item =~ m#.*/([^/]+)$#;
+                            $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+                        }
+                        $newattachmsg .= '</ol>'."\n";
+                    } else {
+                        $currnewattach[0] =~ m#.*/([^/]+)$#;
+                        $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
                     }
-                    $newattachmsg .= '</ol>'."\n";
-                } else {
-                    $currnewattach[0] =~ m#.*/([^/]+)$#;
-                    $newattachmsg .= '<a href="'.$currnewattach[0].'">'.$1.'</a><br />'."\n";
                 }
-            }
-            $discussion.=$newattachmsg;
-	    $discussion.=&generate_preview_button();
-	}
+                $discussion.=$newattachmsg;
+	        $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'}:''))) {
+    } else {
+        if (&discussion_open($status) &&
+            &Apache::lonnet::allowed('pch',
+    	        $ENV{'request.course.id'}.
+	        ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
 		$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
 		    $ressymb.':::" '.$target.'>'.
-		    '<img src="/adm/lonMisc/chat.gif" border="0" />'.
+		    '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
 		    &mt('Post Discussion').'</a></td></tr></table>';
 	    }
 	}
@@ -690,11 +759,10 @@ ENDDISCUSS
 
 sub build_posting_display {
     my ($usernamesort,$subjectsort,$namesort,$notshown,$newitem,$dischash,$shown,$alldiscussion,$imsitems,$imsfiles,$roleinfo,$discussionitems,$replies,$depth,$posters,$maxdepth,$visible,$newpostsflag,$current,$status,$viewgrades,$seeid,$prevread,$sortposts,$ressymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$rolefilter,$sectionpick,$statusfilter,$toggkey,$outputtarget) = @_;
-
     my @original=();
     my @index=();
-
-    my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+    my $symb=&Apache::lonenc::check_decrypt($ressymb);
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
@@ -703,6 +771,11 @@ sub build_posting_display {
         if ($prevread eq '0') {
             $prevread = $oldest-1;
         }
+        my ($skiptest,$rolematch,$roleregexp,$secregexp,$statusregexp);
+        if ($sortposts) {
+            ($skiptest,$roleregexp,$secregexp,$statusregexp) = &filter_regexp($rolefilter,$sectionpick,$statusfilter);
+            $rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp;
+        } 
 	for (my $id=1;$id<=$contrib{'version'};$id++) {
 	    my $idx=$id;
             my $posttime = $contrib{$idx.':timestamp'};
@@ -715,7 +788,7 @@ sub build_posting_display {
 	    my $origindex='0.';
             my $numoldver=0;
 	    if ($contrib{$idx.':replyto'}) {
-                if ( (($ENV{'environment.threadeddiscussion'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+                if ( (($ENV{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
 # this is a follow-up message
 		    $original[$idx]=$original[$contrib{$idx.':replyto'}];
 		    $$depth[$idx]=$$depth[$contrib{$idx.':replyto'}]+1;
@@ -901,16 +974,16 @@ sub build_posting_display {
                             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
 		        }
                         if ($$dischash{$readkey}=~/\.$idx\./) { 
-                            $ctlink = '<b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" />';
+                            $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
                         } else {
-                            $ctlink = '<b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" />';
+                            $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
                         }
                     }
 #figure out at what position this needs to print
                 }
                 if ($outputtarget eq 'export' || $message) {
 		    my $thisindex=$idx;
-		    if ( (($ENV{'environment.threadeddiscussion'}) && (($sortposts eq '') || ($sortposts eq 'ascdate'))) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
+		    if ( (($ENV{'environment.threadeddiscussion'}) && ($sortposts eq '')) || ($sortposts eq 'thread') || ($outputtarget eq 'export')) {
 			$thisindex=$origindex.substr('00'.$$replies[$$depth[$idx]],-2,2);
 		    }
 		    $$alldiscussion{$thisindex}=$idx;
@@ -951,47 +1024,33 @@ sub build_posting_display {
                             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 (defined($ENV{'form.totposters'})) {
+                                if ($totposters == 0) {
+                                    $$shown{$idx} = 0;
+                                } elsif ($totposters > 0) {
+                                    if (grep/^$poster$/,@{$posters}) {
+                                        $$shown{$idx} = 1;
                                     }
                                 }
+                            } elsif ($sortposts) {
                                 if ($skiptest) {
                                     $$shown{$idx} = 1;
                                 } else {
                                     foreach my $role (@{$$roleinfo{$poster}}) {
-                                        if ($role =~ m/^$rolematch$/) {
+                                        if ($role =~ /^cc:/) {
+                                            my $cc_regexp = $roleregexp.':[^:]*:'.$statusregexp;
+                                            if ($role =~ /$cc_regexp/) {
+                                                $$shown{$idx} = 1;
+                                                last;
+                                            }
+                                        } elsif ($role =~ /^$rolematch$/) {
                                             $$shown{$idx} = 1;
                                             last;
                                         }
                                     }
                                 }
+                            } else {
+                                $$shown{$idx} = 1;
                             }
                         }
                         unless ($$notshown{$idx} == 1) {
@@ -1041,6 +1100,60 @@ sub build_posting_display {
     }
 }
 
+sub filter_regexp {
+    my ($rolefilter,$sectionpick,$statusfilter) = @_;
+    my ($roleregexp,$secregexp,$statusregexp);
+    my $skiptest = 1;
+    if (@{$rolefilter} > 0) {
+        my @okrolefilter = ();
+        foreach (@{$rolefilter}) {
+            unless ($_ eq '') {
+                push @okrolefilter, $_;
+            }
+        }
+        if (@okrolefilter > 0) {
+            if (grep/^all$/,@okrolefilter) {
+                $roleregexp='[^:]+';
+            } else {
+                if (@okrolefilter == 1) {
+                    $roleregexp=$okrolefilter[0];
+                } else {
+                    $roleregexp='('.join('|',@okrolefilter).')';
+                }
+                $skiptest = 0;
+            }
+        }
+    }
+    if (@{$sectionpick} > 0) {
+        my @oksectionpick = ();
+        foreach (@{$sectionpick}) {
+            unless ($_ eq '') {
+                 push @oksectionpick, $_;
+            }
+        }
+        if ((@oksectionpick > 0) && (!grep/^all$/,@oksectionpick)) {
+            if (@oksectionpick == 1) {
+                $secregexp = $oksectionpick[0];
+            } else {
+                $secregexp .= '('.join('|',@oksectionpick).')';
+            }
+            $skiptest = 0;
+        } else {
+            $secregexp .= '[^:]*';
+        }
+    }
+    if (defined($statusfilter) && $statusfilter ne '') {
+        if ($statusfilter eq 'all') {
+            $statusregexp = '[^:]+';
+        } else {
+            $statusregexp = $statusfilter;
+            $skiptest = 0;
+        }
+    }
+    return ($skiptest,$roleregexp,$secregexp,$statusregexp);
+}
+
+
 sub get_post_contents {
     my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
     my $discussion = '';
@@ -1480,10 +1593,8 @@ END
 
 sub print_display_options {
     my ($r,$symb,$previous,$dispchgA,$dispchgB,$markchg,$toggchg,$feedurl) = @_;
- # backward compatibility (bulletin boards used to be 'wrapped')
-    if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
-        $feedurl=~s|^/adm/wrapper||;
-    }
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
 
     my $function = &Apache::loncommon::get_users_function();
     my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
@@ -1642,18 +1753,18 @@ $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$l
        <tr bgcolor="#dddddd">
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"
+       <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
            <br />
-           <input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"
+           <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
        </td>
       </tr><tr bgcolor="#eeeeee">
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
-       <td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+       <td><label><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</label></td>
       </tr><tr bgcolor="#dddddd">
        <td>$lt{'dotm'}</td>
        <td>$lt{$disctogg}</td>
-       <td><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</td>
+       <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
       </tr>
      </table>
     </td>
@@ -1664,6 +1775,7 @@ $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$l
 </table>
 <br />
 <br />
+<input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="previous" value="$previous" />
 <input type="hidden" name="$dispchgA" value=""/>
 <input type="hidden" name="$dispchgB" value=""/>
@@ -1681,38 +1793,22 @@ END
 
 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||;
-    }
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    &Apache::lonenc::check_encrypt(\$symb);
     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;
+
+    $numsections = &Apache::loncommon::get_sections($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},$ENV{'course.'.$ENV{'request.course.id'}.'.num'},\%sectioncount);
+
+    if ($ENV{'request.course.sec'} !~ /^\s*$/) {  #Restrict section choice to current section 
+        @sections = ('all',$ENV{'request.course.sec'});
+        $numvisible = 2;
     } else {
         @sections = sort {$a cmp $b} keys(%sectioncount);
         unshift(@sections,'all'); # Put 'all' at the front of the list
@@ -1734,19 +1830,49 @@ sub print_sortfilter_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.',
+        'prca' => 'Set options that control the sort order of posts, and/or which posts are displayed.',
         'soor' => 'Sort order',
-        'disp' => 'Specific user roles',
-        'actv' => 'Specific role status',
+        'spur' => 'Specific user roles',
+        'sprs' => 'Specific role status',
         'spse' => 'Specific sections',
         'psub' => 'Pick specific users (by name)',
         'shal' => 'Show a list of current posters'
     );
+
+    my %sort_types = ();
+    my %role_types = ();
+    my %status_types = ();
+    &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+
     $r->print(<<END);
 <html>
 <head>
 <title>$lt{'diso'}</title>
 <meta http-equiv="pragma" content="no-cache" />
+<script type="text/javascript">
+function verifyFilter() {
+    var rolenum = 0
+    for (var i=0; i<document.modifyshown.rolefilter.length; i++) {
+        if (document.modifyshown.rolefilter.options[i].selected == true) {
+            rolenum ++
+        }
+    }
+    if (rolenum == 0) {
+        document.modifyshown.rolefilter.options[0].selected = true
+    }
+
+    var secnum = 0
+    for (var i=0; i<document.modifyshown.sectionpick.length; i++) {
+        if (document.modifyshown.sectionpick.options[i].selected == true) {
+            secnum ++
+        }
+    }
+    if (secnum == 0) {
+        document.modifyshown.sectionpick.options[0].selected = true
+    }
+    document.modifyshown.submit();
+}
+</script>
 </head>
 $bodytag
 <form name="modifyshown" method="post" action="/adm/feedback">
@@ -1756,60 +1882,61 @@ $bodytag
  <tr>
   <td><b>$lt{'soor'}</b></td>
   <td>&nbsp;</td>
-  <td><b>$lt{'disp'}</b></td>
+  <td><b>$lt{'sprs'}</b></td>
   <td>&nbsp;</td>
-  <td><b>$lt{'actv'}</b></td>
+  <td><b>$lt{'spur'}</b></td>
   <td>&nbsp;</td>
   <td><b>$lt{'spse'}</b></td>
   <td>&nbsp;</td>
   <td><b>$lt{'psub'}</b></td>
  </tr>
  <tr>
-  <td>
+  <td align="center">
    <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
+    <option value="ascdate" selected="selected" />$sort_types{'ascdate'}
+    <option value="descdate" />$sort_types{'descdate'}
+    <option value="thread" />$sort_types{'thread'}
+    <option value="subject" />$sort_types{'subject'}
+    <option value="username" />$sort_types{'username'}
+    <option value="lastfirst" />$sort_types{'lastfirst'}
    </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
+  <td align="center">
+   <select name="statusfilter">
+    <option value="all" selected="selected" />$status_types{'all'}
+    <option value="Active" />$status_types{'Active'}
+    <option value="Expired" />$status_types{'Expired'}
    </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
+  <td align="center">
+   <select name="rolefilter" multiple="true" size="5">
+    <option value="all" />$role_types{'all'}
+    <option value="st" />$role_types{'st'}
+    <option value="cc" />$role_types{'cc'}
+    <option value="in" />$role_types{'in'}
+    <option value="ta" />$role_types{'ta'}
+    <option value="ep" />$role_types{'ep'}
+    <option value="ad" />$role_types{'ad'}
+    <option value="cr" />$role_types{'cr'}
    </select>
   </td>
   <td>&nbsp;</td>
-  <td>
+  <td align="center">
    <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>
+  <td><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></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()" />
+<input type="button" name="sub" value="Store Changes" onClick="verifyFilter()" />
 <br />
 <br />
 </form>
@@ -1820,24 +1947,15 @@ 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|;
-        }
-    }
+
+    &Apache::lonenc::check_encrypt(\$symb);
     my $crs='/'.$ENV{'request.course.id'};
     if ($ENV{'request.course.sec'}) {
         $crs.='_'.$ENV{'request.course.sec'};
     }
     $crs=~s/\_/\//g;
     my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    my %contrib=&Apache::lonnet::restore($ressymb,$ENV{'request.course.id'},
+    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 %namesort = ();
@@ -1906,7 +2024,7 @@ END
                     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('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><label><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</label></td><td>'.$postcounts{$_}.'</td></tr>');
                 }
             }
         }
@@ -1987,9 +2105,10 @@ sub get_post_attachments {
     return;
 }
 
-sub fail_redirect {;
+sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDFAILREDIR);
 <html>
 <head><title>Feedback not sent</title>
@@ -1997,7 +2116,7 @@ sub fail_redirect {;
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 <b>Sorry, no recipients  ...</b>
 <br /><a href="$feedurl">Continue</a>
 </body>
@@ -2006,7 +2125,7 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$secpick,$numpicks) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
@@ -2014,10 +2133,11 @@ sub redirect_back {
   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||;
-  }
+
+  &Apache::loncommon::content_type($r,'text/html');
+  $r->send_http_header;
+
+  &dewrapper(\$feedurl);
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   if ($previous > 0) {
       $qrystr = 'previous='.$previous;
@@ -2036,21 +2156,45 @@ sub redirect_back {
           $feedurl .= '?'.$sortqry;
       }
       $sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
-      if ( (defined($numpicks)) && ($numpicks > 0) ) {
+      if (defined($numpicks)) {
           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.'" />';
+          if (ref($sectionpick) eq 'ARRAY') {
+              $feedurl .= '&sectionpick=';
+              $sectag .=  '<input type="hidden" name="sectionpick" value="';
+              foreach (@{$sectionpick}) {
+                  $feedurl .= $_.',';
+                  $sectag .= $_.',';
+              }
+              $feedurl =~ s/,$//;
+              $sectag =~ s/,$//;
+              $sectag .= '" />';
+          } else {
+              $feedurl .= '&sectionpick='.$sectionpick;
+              $sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
+          }
+          if (ref($rolefilter) eq 'ARRAY') {
+              $feedurl .= '&rolefilter=';
+              $roletag .=  '<input type="hidden" name="rolefilter" value="';
+              foreach (@{$rolefilter}) {
+                  $feedurl .= $_.',';
+                  $roletag .= $_.',';
+              }
+              $feedurl =~ s/,$//;
+              $roletag =~ s/,$//;
+              $roletag .= '" />';
+          } else {
+              $feedurl .= '&rolefilter='.$rolefilter;
+              $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.'" />';
       }
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -2059,7 +2203,7 @@ sub redirect_back {
 <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" />
+<img align="right" src="$logo" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color="red">$status</font>
@@ -2092,10 +2236,11 @@ ENDNOREDIR
 		&Apache::lonenc::check_encrypt($feedurl).'">');
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 <b>$nofeed</b>
 <br /><a href="$feedurl">$continue</a>
 </body>
@@ -2104,47 +2249,49 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-    my ($feedurl) = @_;
+    my ($feedurl,$symb) = @_;
     my $msgoptions='';
     my $discussoptions='';
     unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
 	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
 	    $msgoptions= 
-		'<p><input type="checkbox" name="author" /> '.
-		&mt('Feedback to resource author').'</p>';
+		'<p><label><input type="checkbox" name="author" /> '.
+		&mt('Feedback to resource author').'</label></p>';
 	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="question" /> '.
-		&mt('Question about resource content');
+		'<p><label><input type="checkbox" name="question" /> '.
+		&mt('Question about resource content').'</label></p>';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="course" /> '.
-		&mt('Question/Comment/Feedback about course content');
+		'<p><label><input type="checkbox" name="course" /> '.
+		&mt('Question/Comment/Feedback about course content').
+		'</label></p>';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="policy" /> '.
-		&mt('Question/Comment/Feedback about course policy');
+		'<p><label><input type="checkbox" name="policy" /> '.
+		&mt('Question/Comment/Feedback about course policy').
+		'</label></p>';
 	}
     }
     if ($ENV{'request.course.id'}) {
-	if (&discussion_open() &&
+	if (&discussion_open(undef,$symb) &&
 	    &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='<label><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;" /> '.
+	    $discussoptions.='</label><br /><label><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>';
-      }
+		' <i>('.&mt('name only visible to course faculty').')</i></label>';
+        }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }
 
@@ -2189,8 +2336,6 @@ sub clear_out_html {
 sub assemble_email {
   my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
   my $email=<<"ENDEMAIL";
-Refers to <a href="$feedurl">$feedurl</a>
-
 $message
 ENDEMAIL
     my $citations=<<"ENDCITE";
@@ -2342,6 +2487,7 @@ sub adddiscuss {
             $contrib{'history'} = '';
             my $numoldver = 0;
             my ($oldsymb,$oldidx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+	    &Apache::lonenc::check_decrypt(\$oldsymb);
             $oldsymb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
 # get timestamp for last post and history
             my %oldcontrib=&Apache::lonnet::restore($oldsymb,$ENV{'request.course.id'},
@@ -2417,6 +2563,8 @@ sub adddiscuss {
 
 sub show_preview {
     my $r=shift;
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
     my $message=&clear_out_html($ENV{'form.comment'});
     $message=~s/\n/\<br \/\>/g;
     $message=&Apache::lonspeller::markeduptext($message);
@@ -2457,6 +2605,7 @@ sub modify_attachments {
     if ($idx) {
         &extract_attachments($attachmenturls,$idx,$numoldver,\$msg,\%attachments,\%currattach,$currdelold);
     }
+    &Apache::lonenc::check_encrypt(\$symb);
     $r->print(<<END);
 <html>
 <head>
@@ -2483,7 +2632,7 @@ END
                 foreach my $id (@currold) {
                     my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
                     $attachurl =~ m#/([^/]+)$#;
-                    $r->print('<input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'<br />'."\n");
+                    $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
                 }
                 $r->print("<br />");
             }
@@ -2493,7 +2642,7 @@ END
         $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
         foreach (@{$currnewattach}) {
             $_ =~ m#/([^/]+)$#;
-            $r->print('<input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'<br />'."\n");
+            $r->print('<label><input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'</label><br />'."\n");
         }
         $r->print("<br />"); 
     }
@@ -2737,7 +2886,34 @@ sub has_discussion {
         }
     }
     return;
-} 
+}
+
+sub sort_filter_names {
+    my ($sort_types,$role_types,$status_types) = @_;
+    %{$sort_types} = (
+                     ascdate => 'Date order - oldest first',
+                     descdate => 'Date order - newest first',
+                     thread => 'Threaded',
+                     subject => 'By subject',
+                     username => 'By domain and username',
+                     lastfirst => 'By last name, first name'
+                   );
+    %{$role_types} = (
+                     all => 'All roles',
+                     st  => 'Students',
+                     cc  => 'Course Coordinators',
+                     in  => 'Instructors',
+                     ta  => 'TAs',
+                     ep  => 'Exam proctors',
+                     ad  => 'Administrators',
+                     cr  => 'Custom roles'
+                   );
+    %{$status_types} = (
+                     all     => 'Roles of any status',
+                     Active => 'Only active roles',
+                     Expired => 'Only inactive roles'
+                   );
+}
   
 sub handler {
   my $r = shift;
@@ -2750,13 +2926,13 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','threadedon','threadedoff','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
+         ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
+
   if ($ENV{'form.discsymb'}) {
-      my $symb = $ENV{'form.discsymb'};
+      my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.discsymb'});
       my $readkey = $symb.'_read';
-      my %readinghash = ();
       my $chgcount = 0;
-      %readinghash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$readkey],$ENV{'user.domain'},$ENV{'user.name'});
+      my %readinghash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$readkey],$ENV{'user.domain'},$ENV{'user.name'});
       foreach my $key (keys %ENV) {
           if ($key =~ m/^form\.postunread_(\d+)/) {
               if ($readinghash{$readkey} =~ /\.$1\./) {
@@ -2771,22 +2947,18 @@ sub handler {
           }
       }
       if ($chgcount > 0) {
-          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%readinghash,$ENV{'user.domain'},$ENV{'user.name'});
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+			  \%readinghash,$ENV{'user.domain'},$ENV{'user.name'});
       }
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-      my $previous=$ENV{'form.previous'};
-      my $feedurl = &Apache::lonnet::clutter($url);
-      &redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />','0','0','',$previous,'','','',);
+      &redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />',
+		     '0','0','',$ENV{'form.previous'},'','','',);
       return OK;
   }
   if ($ENV{'form.allversions'}) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions',
-                                          '','');
-      $r->print (<<END);
+      my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
+      $r->print(<<END);
 <html>
 <head>
 <title>Post Versions</title>
@@ -2798,13 +2970,10 @@ END
       if ($ENV{'request.course.sec'}) {
           $crs.='_'.$ENV{'request.course.sec'};
       }
-      $crs=~s/\_/\//g;
+      $crs=~s|_|/|g;
       my $seeid=&Apache::lonnet::allowed('rin',$crs);
       my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.allversions'});
-      my $ressymb=$symb;
-      unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
-          $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
-      }
+      ($symb)=&get_feedurl_and_clean_symb($symb);
       if ($idx > 0) {
           my %messages = ();
           my %subjects = ();
@@ -2812,90 +2981,42 @@ END
           my %allattachments = ();
           my %imsfiles = ();
           my ($screenname,$plainname);
-          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 $discussion = &get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname);
-          $r->print($discussion);
+          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));
       }
       return OK;
   }
   if ($ENV{'form.posterlist'}) {
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      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);
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.applysort'});
+      &print_showposters($r,$symb,$ENV{'form.previous'},$feedurl,
+			 $ENV{'form.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 $sort=$ENV{'form.sortposts'};
-      my @posters = ();
-      if (ref($ENV{'form.stuinfo'}) eq 'ARRAY') {
-          @posters = $ENV{'form.stuinfo'};
-      } else {
-          $posters[0] = $ENV{'form.stuinfo'};
-      }
+      my @posters = &Apache::loncommon::get_env_multiple('form.stuinfo');
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.userpick'});
       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);
+      my %discinfo;
+      $discinfo{$symb.'_userpick'} = join('&',@posters);
+      &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+			   \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+		     '',$ENV{'form.previous'},$ENV{'form.sortposts'},'','','',
+		     $numpicks);
       return OK;
   }
   if ($ENV{'form.applysort'}) {
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      my $symb=$ENV{'form.applysort'};
-      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-      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);
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.applysort'});
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+		     '',$ENV{'form.previous'},$ENV{'form.sortposts'},
+		     $ENV{'form.rolefilter'},$ENV{'form.statusfilter'},
+		     $ENV{'form.sectionpick'});
       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);
+  } elsif ($ENV{'form.cmd'} eq 'sortfilter') {
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+      &print_sortfilter_options($r,$symb,$ENV{'form.previous'},$feedurl);
       return OK;
   } elsif ($ENV{'form.navtime'}) {
       my %discinfo = ();
@@ -2911,9 +3032,7 @@ END
       }
       my $numitems = @resources;
       my $feedurl = '/adm/navmaps';
-      if ($ENV{'form.navurl'}) {
-          $feedurl .= '?'.$ENV{'form.navurl'};
-      }
+      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.',
@@ -2922,6 +3041,7 @@ END
       foreach (@resources) {
 # backward compatibility (bulletin boards used to be 'wrapped')
           my $ressymb=$_;
+	  &Apache::lonenc::check_decrypt(\$ressymb);
           if ($ressymb =~ m/bulletin___\d+___/) {
               unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
                   $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper/|;
@@ -2932,12 +3052,14 @@ END
       }
       my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>";
       if ($numitems > 0) {
-          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+			     \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
       } else {
           $textline = "<b>$lt{'twnp'}</b>";
       }
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
+      my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -2946,7 +3068,7 @@ END
 <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" />
+<img align="right" src="$logo" />
 $textline
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>
@@ -2956,247 +3078,151 @@ $textline
 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 ($dispchgA,$dispchgB,$markchg,$toggchg) = 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,$dispchgA,$dispchgB,$markchg,$toggchg,$feedurl);
-      return OK;
-  } elsif (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) || $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'} || $ENV{'form.toggon'} ) {
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      my $previous=$ENV{'form.previous'};
-      my ($map,$ind,$url);
-      if ( ($ENV{'form.toggoff'}) || ($ENV{'form.toggon'}) ) {
-# ------------------------------ Modify setting for read/unread toggle for each post 
-          my $symb=$ENV{'form.toggoff'}?$ENV{'form.toggoff'}:$ENV{'form.toggon'};
-          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 $toggkey = $ressymb.'_readtoggle';
-          if ($ENV{'form.toggon'}) {
-              $discinfo{$toggkey} = 1;
-          } elsif ($ENV{'form.toggoff'}) {
-              $discinfo{$toggkey} = 0;
-          }
-          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
-      }
-      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'}) || ($ENV{'form.onlyunmark'}) ) {
-# ----------------------------------------------------------------- Modify display setting for this discussion 
-          my $symb;
-          if ($ENV{'form.allposts'}) {
-              $symb = $ENV{'form.allposts'};
-          } elsif ($ENV{'form.onlyunread'}) {
-              $symb = $ENV{'form.onlyunread'};
-          } else {
-              $symb = $ENV{'form.onlyunmark'};
-          }
-          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;
-              $discinfo{$ressymb.'_showonlyunmark'} = 0;
-          } elsif ($ENV{'form.onlyunread'}) {
-              $discinfo{$ressymb.'_showonlyunread'} = 1;
-          } else {
-              $discinfo{$ressymb.'_showonlyunmark'} = 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'}) || ($ENV{'form.onlyunmark'}) ||($ENV{'form.toggoff'}) || ($ENV{'form.toggon'}) ) {
-          &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');
-      }
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.modifydisp'});
+      my ($dispchgA,$dispchgB,$markchg,$toggchg) = 
+	  split(/_/,$ENV{'form.changes'});
+      &print_display_options($r,$symb,$ENV{'form.previous'},$dispchgA,
+			     $dispchgB,$markchg,$toggchg,$feedurl);
       return OK;
-  } elsif ($ENV{'form.markread'}) {
-# ----------------------------------------------------------------- Mark new posts not NEW 
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      my $symb=$ENV{'form.markread'};
-      my $ressymb = $symb;
-      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-      unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
-          $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+  } elsif ($ENV{'form.markondisp'} || $ENV{'form.markonread'} ||
+	   $ENV{'form.allposts'}   || $ENV{'form.onlyunread'} ||
+	   $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'}    ||
+	   $ENV{'form.toggon'}     || $ENV{'form.markread'}) {
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+      my %discinfo;
+# ------------------------ Modify setting for read/unread toggle for each post 
+      if ($ENV{'form.toggoff'}) { $discinfo{$symb.'_readtoggle'}=0; }
+      if ($ENV{'form.toggon'})  { $discinfo{$symb.'_readtoggle'}=1; }
+# --------- Modify setting for identification of 'NEW' posts in this discussion
+      if ($ENV{'form.markondisp'}) {
+	  $discinfo{$symb.'_lastread'} = time;
+	  $discinfo{$symb.'_markondisp'} = 1;
+      }
+      if ($ENV{'form.markonread'}) {
+	  if ( $ENV{'form.previous'} > 0 ) {
+	      $discinfo{$symb.'_lastread'} = $ENV{'form.previous'};
+	  }
+	  $discinfo{$symb.'_markondisp'} = 0;
       }
-      my %discinfo = ();
-      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 reading status').'<br />','0','0');
+# --------------------------------- Modify display setting for this discussion 
+      if ($ENV{'form.allposts'}) {
+	  $discinfo{$symb.'_showonlyunread'} = 0;
+	  $discinfo{$symb.'_showonlyunmark'} = 0;
+      }
+      if ($ENV{'form.onlyunread'}) { $discinfo{$symb.'_showonlyunread'} = 1;  }
+      if ($ENV{'form.onlyunmark'}) { $discinfo{$symb.'_showonlyunmark'} = 1;  }
+# ----------------------------------------------------- Mark new posts not NEW 
+      if ($ENV{'form.markread'})   { $discinfo{$symb.'_lastread'} = time; }
+      &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
+			   \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      my $previous=$ENV{'form.previous'};
+      if ($ENV{'form.markondisp'}) { $previous=undef; }
+      &redirect_back($r,$feedurl,&mt('Changed display status').'<br />',
+		     '0','0','',$previous);
       return OK;
   } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
+      my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
+      my ($symb,$idx)=split(/\:\:\:/,$entry);
+      ($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb);
 
-    my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
+      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 ($symb,$idx)=split(/\:\:\:/,$entry);
-    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+      my $currenthidden=$contrib{'hidden'};
+      my $currentstudenthidden=$contrib{'studenthidden'};
 
-    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 $crs='/'.$ENV{'request.course.id'};
+      if ($ENV{'request.course.sec'}) {
+	  $crs.='_'.$ENV{'request.course.sec'};
+      }
+      $crs=~s/\_/\//g;
+      my $seeid=&Apache::lonnet::allowed('rin',$crs);
 
-        
-    my $currenthidden=$contrib{'hidden'};
-    my $currentstudenthidden=$contrib{'studenthidden'};
+      if ($ENV{'form.hide'}) {
+	  $currenthidden.='.'.$idx.'.';
+	  unless ($seeid) {
+	      $currentstudenthidden.='.'.$idx.'.';
+	  }
+      } else {
+	  $currenthidden=~s/\.$idx\.//g;
+      }
+      my %newhash=('hidden' => $currenthidden);
+      if ( ($ENV{'form.hide'}) && (!$seeid) ) {
+	  $newhash{'studenthidden'} = $currentstudenthidden;
+      }
 
-    my $crs='/'.$ENV{'request.course.id'};
-    if ($ENV{'request.course.sec'}) {
-        $crs.='_'.$ENV{'request.course.sec'};
-    }
-    $crs=~s/\_/\//g;
-    my $seeid=&Apache::lonnet::allowed('rin',$crs);
-    
-    if ($ENV{'form.hide'}) {
-	$currenthidden.='.'.$idx.'.';
-        unless ($seeid) {
-            $currentstudenthidden.='.'.$idx.'.';
-        }
-    } else {
-        $currenthidden=~s/\.$idx\.//g;
-    }
-    my %newhash=('hidden' => $currenthidden);
-    if ( ($ENV{'form.hide'}) && (!$seeid) ) {
-        $newhash{'studenthidden'} = $currentstudenthidden;
-    }
+      &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+                           $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
-    &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
-    &redirect_back($r,&Apache::lonnet::clutter($url),
-       &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'}) {
+      &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
+		     '0','0','',$ENV{'form.previous'});
+      return OK;
+  } elsif ($ENV{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
+      my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
+      if ($ENV{'form.cmd'} eq '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','',$ENV{'form.previous'});
+      &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
+		     '0','0','',$ENV{'form.previous'});
+      return OK;
   } elsif ($ENV{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-
-    my $entry=$ENV{'form.deldisc'};
-
-    my ($symb,$idx)=split(/\:\:\:/,$entry);
-    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 $currentdeleted=$contrib{'deleted'};
-    
-    $currentdeleted.='.'.$idx.'.';
-
-    my %newhash=('deleted' => $currentdeleted);
-
-    &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
-    &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed discussion status').'<br />','0','0','',$ENV{'form.previous'});
+      my ($symb,$idx)=split(/\:\:\:/,$ENV{'form.deldisc'});
+      ($symb,my $feedurl)=&get_feedurl_and_clean_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 %newhash=('deleted' => $contrib{'deleted'}.".$idx.");
+      &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+			   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+      &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
+		     '0','0','',$ENV{'form.previous'});
+      return OK;
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
-      $r->content_type('text/html');
-      $r->send_http_header;
       &show_preview($r);
+      return OK;
   } elsif ($ENV{'form.attach'}) {
 # -------------------------------------------------------- Work on attachments
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','anondiscuss','discuss']);
-      my @currnewattach = ();
-      my @currdelold = ();
-      my @keepold = ();
+      my (@currnewattach,@currdelold,@keepold);
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
       if (exists($ENV{'form.addnewattach.filename'})) {
           unless (length($ENV{'form.addnewattach'})>131072) {
               my $subdir = 'feedback/'.$ENV{'form.timestamp'};
               my $newattachment=&Apache::lonnet::userfileupload('addnewattach',undef,$subdir);
-              push @currnewattach, $newattachment;
+	      push @currnewattach, $newattachment;
           }
       }
-      my $attachmenturls = '';
+      my $attachmenturls;
+      my ($symb) = &get_feedurl_and_clean_symb($ENV{'form.attach'});
       my $idx = $ENV{'form.idx'};
-      my $symb = $ENV{'form.attach'};
       if ($idx) {
           my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
                          $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
                          $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
           $attachmenturls = $contrib{$idx.':attachmenturl'};
       }
-      &modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx,$attachmenturls);
-  } elsif ($ENV{'form.chgreads'}) {
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ENV{'form.chgreads'});
-      &redirect_back($r,&Apache::lonnet::clutter($url),
-       &mt('Changed read status').'<br />','0','0');
+      &modify_attachments($r,\@currnewattach,\@currdelold,$symb,$idx,
+			  $attachmenturls);
+      return OK;
   } elsif ($ENV{'form.export'}) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      my $symb=$ENV{'form.export'};
-      my $mode;
+      my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.export'});
+      my $mode='board';
       my $status='OPEN';
-      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$|) {
-          $mode = 'board';
-          $feedurl=~s|^/adm/wrapper||;
-      }
       if ($feedurl =~ /\.(problem|exam|quiz|assess|survey|form|library)$/) {
           $mode='problem';
           $status=$Apache::inputtags::status[-1];
@@ -3207,69 +3233,79 @@ ENDREDIR
       return OK;
   } else {
 # ------------------------------------------------------------- Normal feedback
-  my $feedurl=$ENV{'form.postdata'};
-  $feedurl=~s/^http\:\/\///;
-  $feedurl=~s/^$ENV{'SERVER_NAME'}//;
-  $feedurl=~s/^$ENV{'HTTP_HOST'}//;
-  $feedurl=~s/\?.+$//;
+      my $feedurl=$ENV{'form.postdata'};
+      $feedurl=~s/^http\:\/\///;
+      $feedurl=~s/^$ENV{'SERVER_NAME'}//;
+      $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+      $feedurl=~s/\?.+$//;
 
-  my $symb;
-  if ($ENV{'form.replydisc'}) {
-      $symb=(split(/\:\:\:/,$ENV{'form.replydisc'}))[0];
-      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-      $feedurl=&Apache::lonnet::clutter($url);
-  } elsif ($ENV{'form.editdisc'}) {
-      $symb=(split(/\:\:\:/,$ENV{'form.editdisc'}))[0];
-      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-      $feedurl=&Apache::lonnet::clutter($url);
-  } elsif ($ENV{'form.origpage'}) {
-      $symb=""; 
-  } else {
-      $symb=&Apache::lonnet::symbread($feedurl);
-  }
-  unless ($symb) {
-      $symb=$ENV{'form.symb'};
-      if ($symb) {
+      my $symb;
+      if ($ENV{'form.replydisc'}) {
+	  $symb=(split(/\:\:\:/,$ENV{'form.replydisc'}))[0];
 	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-          $feedurl=&Apache::lonnet::clutter($url);
+	  $feedurl=&Apache::lonnet::clutter($url);
+      } elsif ($ENV{'form.editdisc'}) {
+	  $symb=(split(/\:\:\:/,$ENV{'form.editdisc'}))[0];
+	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+	  $feedurl=&Apache::lonnet::clutter($url);
+      } elsif ($ENV{'form.origpage'}) {
+	  $symb=""; 
+      } else {
+	  $symb=&Apache::lonnet::symbread($feedurl);
+      }
+      unless ($symb) {
+	  $symb=$ENV{'form.symb'};
+	  if ($symb) {
+	      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+	      $feedurl=&Apache::lonnet::clutter($url);
+	  }
+      }
+      &Apache::lonenc::check_decrypt(\$symb);
+      my $goahead=1;
+      if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+	  unless ($symb) { $goahead=0; }
+      }
+      # backward compatibility (bulletin boards used to be 'wrapped')
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+	  $feedurl=~s|^/adm/wrapper||;
+      }
+      if (!$goahead) {
+          # Ambiguous Problem Resource
+	  $r->internal_redirect('/adm/ambiguous');
+	  return OK;
       }
-  }
-  my $goahead=1;
-  if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-      unless ($symb) { $goahead=0; }
-  }
-  # backward compatibility (bulletin 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
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-  
-    if (
-      (
-       ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
-      ) 
-      || 
-      ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
-      ||
-      ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
-     ) {
+      unless (
+	  (
+	   ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
+	   ) 
+	  || 
+	  ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
+	  ||
+	  ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
+	  ) {
+	  &Apache::loncommon::content_type($r,'text/html');
+	  $r->send_http_header;
+# Unable to give feedback
+	  &no_redirect_back($r,$feedurl);
+      }
 # --------------------------------------------------- Print login screen header
-    unless ($ENV{'form.sendit'}) {
-      my $options=&screen_header($feedurl);
-      if ($options) {
-        &mail_screen($r,$feedurl,$options);
-      } else {
-	&fail_redirect($r,$feedurl);
+      unless ($ENV{'form.sendit'}) {
+	  &Apache::loncommon::content_type($r,'text/html');
+	  $r->send_http_header;
+	  my $options=&screen_header($feedurl,$symb);
+	  if ($options) {
+	      &mail_screen($r,$feedurl,$options);
+	  } else {
+	      &fail_redirect($r,$feedurl);
+	  }
+	  return OK;
       }
-    } else {
       
 # Get previous user input
       my $prevattempts=&Apache::loncommon::get_previous_attempt(
-            $symb,$ENV{'user.name'},$ENV{'user.domain'},
-            $ENV{'request.course.id'});
+                                   $symb,$ENV{'user.name'},$ENV{'user.domain'},
+				   $ENV{'request.course.id'});
 
 # Get output from resource
       my $usersaw=&resource_output($feedurl);
@@ -3277,26 +3313,28 @@ ENDREDIR
 # Get resource answer (need to allow student to view grades for this to work)
       &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
       my $useranswer=&Apache::loncommon::get_student_answers(
-                       $symb,$ENV{'user.name'},$ENV{'user.domain'},
-		       $ENV{'request.course.id'});
+                                   $symb,$ENV{'user.name'},$ENV{'user.domain'},
+		                   $ENV{'request.course.id'});
       &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
       my $attachmenturl='';
-      if (($ENV{'form.origpage'}) || ($ENV{'form.editdisc'}) || ($ENV{'form.replydisc'})) {
-          my ($symb,$idx);
-          if ($ENV{'form.replydisc'}) {
-              ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
-          } elsif ($ENV{'form.editdisc'}) {
-              ($symb,$idx)=split(/\:\:\:/,$ENV{'form.editdisc'});
-          } elsif ($ENV{'form.origpage'}) {
-              $symb = $ENV{'form.symb'};
-          }
-          my @currnewattach = ();
-          my @deloldattach = ();
-          my @keepold = ();
-          &process_attachments(\@currnewattach,\@deloldattach,\@keepold);
-          $symb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
-          $attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx);
+      if (($ENV{'form.origpage'}) || ($ENV{'form.editdisc'}) ||
+	  ($ENV{'form.replydisc'})) {
+	  my ($symb,$idx);
+	  if ($ENV{'form.replydisc'}) {
+	      ($symb,$idx)=split(/\:\:\:/,$ENV{'form.replydisc'});
+	  } elsif ($ENV{'form.editdisc'}) {
+	      ($symb,$idx)=split(/\:\:\:/,$ENV{'form.editdisc'});
+	  } elsif ($ENV{'form.origpage'}) {
+	      $symb = $ENV{'form.symb'};
+	  }
+	  &Apache::lonenc::check_decrypt(\$symb);
+	  my @currnewattach = ();
+	  my @deloldattach = ();
+	  my @keepold = ();
+	  &process_attachments(\@currnewattach,\@deloldattach,\@keepold);
+	  $symb=~s|(bulletin___\d+___)adm/wrapper/|$1|;
+	  $attachmenturl=&construct_attachmenturl(\@currnewattach,\@keepold,$symb,$idx);
       } elsif ($ENV{'form.attachment.filename'}) {
 	  unless (length($ENV{'form.attachment'})>131072) {
 	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback');
@@ -3307,49 +3345,65 @@ ENDREDIR
 
 # Assemble email
       my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
-          $usersaw,$useranswer);
+					     $usersaw,$useranswer);
  
 # Who gets this?
       my ($typestyle,%to) = &decide_receiver($feedurl);
 
 # Actually send mail
       my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
-          $attachmenturl,%to);
+				      $attachmenturl,%to);
 
 # Discussion? Store that.
 
       my $numpost=0;
-      if ($ENV{'form.discuss'}) {
-          my $subject = &clear_out_html($ENV{'form.subject'});
-	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl,$subject);
-	  $numpost++;
-      }
-
-      if ($ENV{'form.anondiscuss'}) {
-          my $subject = &clear_out_html($ENV{'form.subject'});
-	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl,$subject);
+      if ($ENV{'form.discuss'} || $ENV{'form.anondiscuss'}) {
+	  my $subject = &clear_out_html($ENV{'form.subject'});
+	  my $anonmode=(defined($ENV{'form.anondiscuss'}));
+	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
+				  $subject);
 	  $numpost++;
       }
-
-
+	  
 # Receipt screen and redirect back to where came from
       &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$ENV{'form.previous'});
-
-    }
-   } else {
-# Unable to give feedback
-    &no_redirect_back($r,$feedurl);
-   }
-  } else {
-# Ambiguous Problem Resource
-      if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-	  &Apache::lonnet::cleanenv();
-      }
-      $r->internal_redirect('/adm/ambiguous');
   }
-}
   return OK;
 } 
 
+sub wrap_symb {
+    my ($ressymb)=@_;
+    if ($ressymb =~ /bulletin___\d+___/) {
+        unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+            $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+        }
+    }
+    return $ressymb;
+}
+sub dewrapper {
+    my ($feedurl)=@_;
+    if ($$feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+        $$feedurl=~s|^/adm/wrapper||;
+    }
+}
+
+sub get_feedurl {
+    my ($symb)=@_;
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+    my $feedurl = &Apache::lonnet::clutter($url);
+    &dewrapper(\$feedurl);
+    return $feedurl;
+}
+
+sub get_feedurl_and_clean_symb {
+    my ($symb)=@_;
+    &Apache::lonenc::check_decrypt(\$symb);
+# backward compatibility (bulletin boards used to be 'wrapped')
+    unless ($symb =~ m|bulletin___\d+___adm/wrapper|) {
+	$symb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+    }
+    my $feedurl = &get_feedurl($symb);
+    return ($symb,$feedurl);
+}
 1;
 __END__