--- loncom/interface/lonuserutils.pm 2008/12/06 20:32:37 1.75
+++ loncom/interface/lonuserutils.pm 2009/01/27 15:59:30 1.79
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.75 2008/12/06 20:32:37 schafran Exp $
+# $Id: lonuserutils.pm,v 1.79 2009/01/27 15:59:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1316,6 +1316,12 @@ sub print_userlist {
($cnum,$cdom) = &get_course_identity();
$r->print(§ion_group_filter($cnum,$cdom));
}
+ if ($env{'form.phase'} eq '') {
+ $r->print('
'.&list_submit_button(&mt('Display List of Users')).
+ "\n
\n".
+ '');
+ return;
+ }
if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
$r->print(' '.&list_submit_button(&mt('Update Display')).
"\n\n");
@@ -2050,7 +2056,7 @@ END
'status' => "status",
'role' => "role",
'type' => "enroll type/action",
- 'email' => "email address",
+ 'email' => "e-mail address",
'photo' => "photo",
'extent' => "extent",
'pr' => "Proceed",
@@ -2457,7 +2463,7 @@ END
$cellentry = ''.&mt('auto').' ';
$autocount ++;
} else {
- $cellentry = '';
}
$r->print("$cellentry | \n");
} else {
@@ -3637,14 +3643,13 @@ sub upfile_drop_add {
ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
$r->print('
'.
&mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
- ''.$entries{$fields{'username'}}.'',$fname,$mname,$lname,$gen).
- '');
+ ''.$entries{$fields{'username'}}.'',$fname,$mname,$lname,$gen));
next;
} else {
if ($entries{$fields{'domain'}}
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
$r->print('
'. ''.$entries{$fields{'domain'}}.
- ': '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen).'');
+ ': '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen));
next;
}
my $username = $entries{$fields{'username'}};