--- loncom/interface/lonuserutils.pm 2010/11/15 17:37:47 1.109.2.9
+++ loncom/interface/lonuserutils.pm 2010/12/05 17:28:10 1.109.2.12
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.109.2.9 2010/11/15 17:37:47 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.109.2.12 2010/12/05 17:28:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -914,7 +914,7 @@ sub print_upload_manager_footer {
}
$Str .= &set_login($defdom,$krbform,$intform,$locform);
if ($env{'form.context'} eq 'requestcrs') {
- $Str .= '';
+ $Str .= '';
}
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($defdom,'lcserver',
@@ -1223,15 +1223,15 @@ sub setup_date_selectors {
sub get_dates_from_form {
- my ($startname,$endname) = @_;
+ my ($startname,$endname,$timezone) = @_;
if ($startname eq '') {
$startname = 'startdate';
}
if ($endname eq '') {
$endname = 'enddate';
}
- my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
- my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname);
+ my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname,$timezone);
+ my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname,$timezone);
if ($env{'form.no_end_date'}) {
$enddate = 0;
}
@@ -2710,7 +2710,8 @@ END
);
my $navmap = Apache::lonnavmaps::navmap->new();
if (defined($navmap)) {
- my @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/default_1261144274.sequence',sub { $_[0]->is_problem() },0);
+ my $sequence = &Apache::loncommon::get_citest_map($cdom);
+ my @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/'.$sequence,sub { $_[0]->is_problem() },0);
foreach my $resource (@allres) {
my @parts = $resource->parts();
my $count = scalar(@parts);
@@ -4401,8 +4402,14 @@ sub upfile_drop_add {
}
}
if (!$cancreate{$usertype}) {
- $r->print(' '.
- &mt("[_1]: The user does not exist, and you are not permitted to create users of type: $longtypes{$usertype}.",''.$username.''));
+ my $showtype = $longtypes{$usertype};
+ if ($usertype eq 'unofficial') {
+ $r->print(' '.
+ &mt("[_1]: The user does not exist, and the new user's username must be an e-mail address.",''.$username.''));
+ } else {
+ $r->print(' '.
+ &mt("[_1]: The user does not exist, and you are not permitted to create users of type: [_2].",''.$username.'',$showtype));
+ }
next;
}
} else {