--- loncom/interface/lonfeedback.pm 2006/05/08 22:12:29 1.196
+++ loncom/interface/lonfeedback.pm 2006/05/09 20:38:45 1.199
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.196 2006/05/08 22:12:29 albertel Exp $
+# $Id: lonfeedback.pm,v 1.199 2006/05/09 20:38:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -726,7 +726,7 @@ ENDDISCUSS
if ($outputtarget ne 'tex') {
$discussion.=&generate_attachments_button('',$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,'',$mode);
if (@currnewattach > 0) {
- $newattachmsg .= 'New attachments
';
+ $newattachmsg .= '
New attachments
';
if (@currnewattach > 1) {
$newattachmsg .= '
';
foreach my $item (@currnewattach) {
@@ -1328,12 +1328,15 @@ sub mail_screen {
my $attachnum = 0;
my $anonchk = (<print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver));
if ($attachnum > 0) {
if (@currnewattach > 0) {
- $newattachmsg .= 'New attachments
';
+ $newattachmsg .= '
New attachments
';
if (@currnewattach > 1) {
$newattachmsg .= '';
foreach my $item (@currnewattach) {
@@ -1817,23 +1817,21 @@ sub print_sortfilter_options {
$r->send_http_header;
&Apache::lonenc::check_encrypt(\$symb);
- my @sections = ();
+ my @sections;
my $section_sel = '';
- my $numsections = 0;
my $numvisible = 5;
- my %sectioncount = ();
-
- $numsections = &Apache::loncommon::get_sections($env{'course.'.$env{'request.course.id'}.'.domain'},$env{'course.'.$env{'request.course.id'}.'.num'},\%sectioncount);
+ my %sectioncount = &Apache::loncommon::get_sections();
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
- if ($numsections < 4) {
- $numvisible = $numsections + 1;
+ if (scalar(@sections) < 4) {
+ $numvisible = scalar(@sections) + 1;
}
+ unshift(@sections,'all'); # Put 'all' at the front of the list
+
}
foreach (@sections) {
$section_sel .= " $_\n";
@@ -2294,10 +2292,9 @@ sub screen_header {
&Apache::lonnet::allowed('pch',
$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
- $discussoptions='