--- loncom/interface/lonfeedback.pm	2004/11/17 16:42:39	1.139
+++ loncom/interface/lonfeedback.pm	2005/02/14 01:37:45	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.139 2004/11/17 16:42:39 albertel Exp $
+# $Id: lonfeedback.pm,v 1.149 2005/02/14 01:37:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,13 +68,18 @@ sub discussion_visible {
 }
 
 sub list_discussion {
-    my ($mode,$status,$ressymb)=@_;
+    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,7 +89,7 @@ sub list_discussion {
     my $cid=$ENV{'request.course.id'};
     if ($ENV{'request.course.sec'}) {
 	$crs.='_'.$ENV{'request.course.sec'};
-    }                 
+    }
     $crs=~s/\_/\//g;
     unless ($ressymb) {	$ressymb=&Apache::lonnet::symbread(); }
     unless ($ressymb) { return ''; }
@@ -122,7 +127,18 @@ sub list_discussion {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','totposters']);
     my $sortposts = $ENV{'form.sortposts'};
     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) {
@@ -140,13 +156,18 @@ sub list_discussion {
         %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'},
@@ -224,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,$encsymb,$target,$readkey,$showunmark,$showonlyunread,$totposters,$ENV{'form.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;
@@ -309,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);
             }
@@ -397,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;
                 }
@@ -435,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) ) {
@@ -481,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>';
                     }
@@ -539,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">'.
@@ -578,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 />';
@@ -638,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>';
 	    }
 	}
@@ -683,7 +759,6 @@ 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 $symb=&Apache::lonenc::check_decrypt($ressymb);
@@ -696,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'};
@@ -708,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;
@@ -903,7 +983,7 @@ sub build_posting_display {
                 }
                 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;
@@ -944,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) {
@@ -1034,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 = '';
@@ -1682,30 +1802,13 @@ sub print_sortfilter_options {
     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
@@ -1727,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">
@@ -1749,47 +1882,48 @@ $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>
@@ -1802,7 +1936,7 @@ $bodytag
 <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>
@@ -1990,7 +2124,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 = '';
@@ -2021,18 +2155,41 @@ 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);
@@ -2089,7 +2246,7 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-    my ($feedurl) = @_;
+    my ($feedurl,$symb) = @_;
     my $msgoptions='';
     my $discussoptions='';
     unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
@@ -2115,7 +2272,7 @@ sub screen_header {
 	}
     }
     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'}:''))) {
@@ -2125,11 +2282,11 @@ sub screen_header {
 	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
 		&mt('Anonymous contribution to course discussion of resource').
 		' <i>('.&mt('name only visible to course faculty').')</i>';
-      }
+        }
     }
-    if ($msgoptions) { $msgoptions='<h2><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;
 }
 
@@ -2724,7 +2881,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;
@@ -2738,6 +2922,7 @@ sub handler {
 
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
+
   if ($ENV{'form.discsymb'}) {
       my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.discsymb'});
       my $readkey = $symb.'_read';
@@ -2768,7 +2953,7 @@ sub handler {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
-      $r->print (<<END);
+      $r->print(<<END);
 <html>
 <head>
 <title>Post Versions</title>
@@ -2822,7 +3007,7 @@ END
       &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.secpick'});
+		     $ENV{'form.sectionpick'});
       return OK;
   } elsif ($ENV{'form.cmd'} eq 'sortfilter') {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
@@ -3102,7 +3287,7 @@ ENDREDIR
       unless ($ENV{'form.sendit'}) {
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
-	  my $options=&screen_header($feedurl);
+	  my $options=&screen_header($feedurl,$symb);
 	  if ($options) {
 	      &mail_screen($r,$feedurl,$options);
 	  } else {