--- loncom/interface/longroup.pm 2006/07/02 17:08:42 1.8 +++ loncom/interface/longroup.pm 2006/07/08 00:52:45 1.9 @@ -474,9 +474,11 @@ sub group_memberlist { my %current = (); my $hastools = 0; my $addtools = 0; - my $num_previous = 0; - my $num_future = 0; - my $num_active = 0; + my %member_nums = ( + 'previous' => 0, + 'future' => 0, + 'active' => 0, + ); my $now = time; if (keys(%membership) > 0) { my %allnames = (); @@ -507,15 +509,15 @@ sub group_memberlist { if (($end > 0) && ($end < $now)) { $current{$user}{changestate} = 'reenable'; $current{$user}{'status'} = 'previous'; - $num_previous++; + $member_nums{'previous'} ++; } elsif (($start > $now)) { $current{$user}{changestate} = 'activate'; $current{$user}{'status'} = 'future'; - $num_future ++; + $member_nums{'future'} ++; } else { $current{$user}{changestate} = 'expire'; $current{$user}{'status'} = 'active'; - $num_active ++; + $member_nums{'active'} ++; } if (@userprivs > 0) { foreach my $tool (sort(keys(%{$fixedprivs}))) { @@ -563,8 +565,7 @@ sub group_memberlist { } } } - return (\%current,$hastools,$addtools,$num_previous,$num_future, - $num_active); + return (\%current,$hastools,$addtools,\%member_nums); } ############################################### @@ -611,11 +612,8 @@ sub get_bbfolder_url { my %curr_groups = &coursegroups($cdom,$cnum,$group); my $grpbbmap; if (%curr_groups) { - my %group_info = &get_group_settings($curr_groups{$group}); - my $creation = $group_info{'creation'}; - my $bbfolder = $creation + 1; my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/'; - $grpbbmap = $crspath.'default_'.$bbfolder.'.sequence'; + $grpbbmap = $crspath.'group_boards_'.$group.'.sequence'; } return $grpbbmap; }