--- loncom/interface/lonuserutils.pm 2009/02/19 11:07:20 1.82 +++ loncom/interface/lonuserutils.pm 2009/03/05 23:58:00 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.82 2009/02/19 11:07:20 weissno Exp $ +# $Id: lonuserutils.pm,v 1.83 2009/03/05 23:58:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1914,15 +1914,15 @@ sub aggregate_user_info { sub process_date_info { my ($userdata) = @_; my $now = time; - $userdata->{'status'} = &mt('Active'); + $userdata->{'status'} = 'Active'; if ($userdata->{'start'} > 0) { if ($now < $userdata->{'start'}) { - $userdata->{'status'} = &mt('Future'); + $userdata->{'status'} = 'Future'; } } if ($userdata->{'end'} > 0) { if ($now > $userdata->{'end'}) { - $userdata->{'status'} = &mt('Expired'); + $userdata->{'status'} = 'Expired'; } } return; @@ -2309,6 +2309,11 @@ END $grpfilter = 'all'; } } + my %ltstatus = &Apache::lonlocal::texthash( + Active => 'Active', + Future => 'Future', + Expired => 'Expired', + ); # Get groups, role, permanent e-mail so we can sort on them if # necessary. foreach my $user (keys(%{$userlist})) { @@ -2521,6 +2526,12 @@ END $r->print(''.&print_username_link($mode,\%in).''); } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) { $r->print(''.$in{$item}.''."\n"); + } elsif ($item eq 'status') { + my $showitem = $in{$item}; + if (defined($ltstatus{$in{$item}})) { + $showitem = $ltstatus{$in{$item}}; + } + $r->print(''.$showitem.''."\n"); } else { $r->print(''.$in{$item}.''."\n"); }