--- loncom/interface/lonuserutils.pm 2008/09/26 08:38:11 1.70 +++ loncom/interface/lonuserutils.pm 2008/10/15 13:00:24 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.70 2008/09/26 08:38:11 bisitz Exp $ +# $Id: lonuserutils.pm,v 1.72 2008/10/15 13:00:24 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1477,7 +1477,10 @@ sub print_userlist { $permission,$env{'form.Status'},\%userlist,$keylist); } if (!$usercount) { - $r->print('<br />'.&mt('There are no users matching the search criteria.')); + $r->print('<br /><span class="LC_warning">' + .&mt('There are no users matching the search criteria.') + .'</span>' + ); } } $r->print('<input type="hidden" name="phase" value="'. @@ -1901,15 +1904,15 @@ sub aggregate_user_info { sub process_date_info { my ($userdata) = @_; my $now = time; - $userdata->{'status'} = 'Active'; + $userdata->{'status'} = &mt('Active'); if ($userdata->{'start'} > 0) { if ($now < $userdata->{'start'}) { - $userdata->{'status'} = 'Future'; + $userdata->{'status'} = &mt('Future'); } } if ($userdata->{'end'} > 0) { if ($now > $userdata->{'end'}) { - $userdata->{'status'} = 'Expired'; + $userdata->{'status'} = &mt('Expired'); } } return; @@ -3630,7 +3633,7 @@ sub upfile_drop_add { '</b>'); next; } else { - if ($entries{$fields{'dom'}} + if ($entries{$fields{'domain'}} ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) { $r->print('<br />'. '<b>'.$entries{$fields{'domain'}}. '</b>: '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen).'</b>');