version 1.156, 2013/09/26 17:46:42
|
version 1.158, 2013/12/09 18:47:18
|
Line 2469 sub show_users_list {
|
Line 2469 sub show_users_list {
|
@sortable = ('username','fullname','email','status'); |
@sortable = ('username','fullname','email','status'); |
} |
} |
my %is_sortable; |
my %is_sortable; |
map { $is_sortable{$_} => 1; } @sortable; |
map { $is_sortable{$_} = 1; } @sortable; |
unless ($is_sortable{$sortby}) { |
unless ($is_sortable{$sortby}) { |
$sortby = 'username'; |
$sortby = 'username'; |
} |
} |
Line 4271 sub upfile_drop_add {
|
Line 4271 sub upfile_drop_add {
|
if ($entries{$fields{'username'}} =~ /\s/) { |
if ($entries{$fields{'username'}} =~ /\s/) { |
$nowhitespace = ' - '.&mt('usernames may not contain spaces.'); |
$nowhitespace = ' - '.&mt('usernames may not contain spaces.'); |
} |
} |
$r->print('<br />'. |
$r->print( |
&mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]', |
'<br />'. |
'<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen). |
&mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]', |
$nowhitespace); |
'"<b>'.$entries{$fields{'username'}}.'</b>"', |
|
$fname,$mname,$lname,$gen). |
|
$nowhitespace); |
next; |
next; |
} else { |
} else { |
$entries{$fields{'domain'}} =~ s/^\s+|\s+$//g; |
$entries{$fields{'domain'}} =~ s/^\s+|\s+$//g; |
if ($entries{$fields{'domain'}} |
if ($entries{$fields{'domain'}} |
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) { |
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) { |
$r->print('<br />'. '<b>'.$entries{$fields{'domain'}}. |
$r->print( |
'</b>: '.&mt('Unacceptable domain for user [_1] [_2] [_3] [_4]',$fname,$mname,$lname,$gen)); |
'<br />'. |
next; |
&mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]', |
|
'"<b>'.$entries{$fields{'domain'}}.'</b>"', |
|
$fname,$mname,$lname,$gen)); |
|
next; |
} |
} |
my $username = $entries{$fields{'username'}}; |
my $username = $entries{$fields{'username'}}; |
my $userdomain = $entries{$fields{'domain'}}; |
my $userdomain = $entries{$fields{'domain'}}; |