--- loncom/interface/lonfeedback.pm 2006/07/17 23:02:33 1.208 +++ loncom/interface/lonfeedback.pm 2006/07/18 17:31:50 1.210 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.208 2006/07/17 23:02:33 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.210 2006/07/18 17:31:50 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -138,25 +138,10 @@ sub list_discussion { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['previous','sortposts','rolefilter','statusfilter','sectionpick','grouppick','totposters']); my $sortposts = $env{'form.sortposts'}; my $statusfilter = $env{'form.statusfilter'}; - my @sectionpick = (); - if ($env{'form.sectionpick'} =~ /,/) { - @sectionpick = split/,/,$env{'form.sectionpick'}; - } else { - $sectionpick[0] = $env{'form.sectionpick'}; - } - my @grouppick = (); - if ($env{'form.grouppick'} =~ /,/) { - @grouppick = split/,/,$env{'form.grouppick'}; - } else { - $grouppick[0] = $env{'form.grouppick'}; - } + my @sectionpick = split(/,/,$env{'form.sectionpick'}); + my @grouppick = split(/,/,$env{'form.grouppick'}); + my @rolefilter = split(/,/,$env{'form.rolefilter'}); - 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) { @@ -767,15 +752,16 @@ END if (($group ne '') && ($mode eq 'board')) { if (&check_group_priv($group,'pgd') eq 'ok') { $discussion .= - &postingform_display($mode,$ressymb,$now,$subject,$comment, - $outputtarget,$attachnum,$currnewattach, - $currdelold,$group); + &postingform_display($mode,$ressymb,$now,$subject, + $comment,$outputtarget,$attachnum, + $currnewattach,$currdelold, + $group); } } else { $discussion.= - &postingform_display($mode,$ressymb,$now,$subject,$comment, - $outputtarget,$attachnum,$currnewattach, - $currdelold); + &postingform_display($mode,$ressymb,$now,$subject, + $comment,$outputtarget,$attachnum, + $currnewattach,$currdelold); } } } else { @@ -858,15 +844,15 @@ 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,$grouppick,$classgroups,$statusfilter,$toggkey,$outputtarget,$anonhash,$anoncnt,$group) = @_; my @original=(); my @index=(); - my $skipgrpcheck = 0; + my $skip_group_check = 0; my $symb=&Apache::lonenc::check_decrypt($ressymb); my $escsymb=&escape($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'}); - if ((@{$grouppick} == 0) || (grep/^all$/,@{$grouppick})) { - $skipgrpcheck = 1; + if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) { + $skip_group_check = 1; } if ($contrib{'version'}) { my $oldest = $contrib{'1:timestamp'}; @@ -1182,7 +1168,7 @@ sub build_posting_display { } } } - if ($$shown{$idx} && !$skipgrpcheck) { + if ($$shown{$idx} && !$skip_group_check) { my $showflag = 0; if (ref($$classgroups{$poster}{active}) eq 'HASH') { foreach my $grp (@{$grouppick}) {