--- loncom/interface/lonuserutils.pm 2013/09/26 17:46:42 1.156
+++ loncom/interface/lonuserutils.pm 2013/12/09 18:47:18 1.158
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.156 2013/09/26 17:46:42 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.158 2013/12/09 18:47:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2469,7 +2469,7 @@ sub show_users_list {
@sortable = ('username','fullname','email','status');
}
my %is_sortable;
- map { $is_sortable{$_} => 1; } @sortable;
+ map { $is_sortable{$_} = 1; } @sortable;
unless ($is_sortable{$sortby}) {
$sortby = 'username';
}
@@ -4271,18 +4271,23 @@ sub upfile_drop_add {
if ($entries{$fields{'username'}} =~ /\s/) {
$nowhitespace = ' - '.&mt('usernames may not contain spaces.');
}
- $r->print('
'.
- &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
- ''.$entries{$fields{'username'}}.'',$fname,$mname,$lname,$gen).
- $nowhitespace);
+ $r->print(
+ '
'.
+ &mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]',
+ '"'.$entries{$fields{'username'}}.'"',
+ $fname,$mname,$lname,$gen).
+ $nowhitespace);
next;
} else {
$entries{$fields{'domain'}} =~ s/^\s+|\s+$//g;
if ($entries{$fields{'domain'}}
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
- $r->print('
'. ''.$entries{$fields{'domain'}}.
- ': '.&mt('Unacceptable domain for user [_1] [_2] [_3] [_4]',$fname,$mname,$lname,$gen));
- next;
+ $r->print(
+ '
'.
+ &mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
+ '"'.$entries{$fields{'domain'}}.'"',
+ $fname,$mname,$lname,$gen));
+ next;
}
my $username = $entries{$fields{'username'}};
my $userdomain = $entries{$fields{'domain'}};