--- loncom/interface/lonuserutils.pm 2017/08/11 00:24:53 1.188
+++ loncom/interface/lonuserutils.pm 2017/11/04 16:13:31 1.191
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.188 2017/08/11 00:24:53 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.191 2017/11/04 16:13:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1127,8 +1127,10 @@ sub print_upload_manager_form {
if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($r);
} else {
- $datatoken=$env{'form.datatoken'};
- &Apache::loncommon::load_tmp_file($r);
+ $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+ if ($datatoken ne '') {
+ &Apache::loncommon::load_tmp_file($r,$datatoken);
+ }
}
my @records=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){
@@ -4114,7 +4116,10 @@ sub print_first_users_upload_form {
# ================================================= Drop/Add from uploaded file
sub upfile_drop_add {
my ($r,$context,$permission,$showcredits) = @_;
- &Apache::loncommon::load_tmp_file($r);
+ my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+ if ($datatoken ne '') {
+ &Apache::loncommon::load_tmp_file($r,$datatoken);
+ }
my @userdata=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){shift(@userdata);}
my @keyfields = split(/\,/,$env{'form.keyfields'});
@@ -4169,19 +4174,25 @@ sub upfile_drop_add {
my $domain;
if ($env{'form.defaultdomain'} ne '') {
if (($context eq 'course') || ($setting eq 'course')) {
- unless ($env{'form.defaultdomain'} eq $crsdom) {
+ if ($env{'form.defaultdomain'} eq $crsdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
if (&Apache::lonnet::will_trust('enroll',$crsdom,$env{'form.defaultdomain'})) {
$domain = $env{'form.defaultdomain'};
} else {
$r->print(''.&mt('Error').
&mt('Enrollment of users not permitted for specified default domain: [_1].',
&Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'');
- $r->print(&Apache::loncommon::end_page());
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('');
+ }
+ return;
}
- return;
}
} elsif ($context eq 'author') {
- unless ($env{'form.defaultdomain'} eq $defdom) {
+ if ($env{'form.defaultdomain'} eq $defdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
if ((&Apache::lonnet::will_trust('othcoau',$defdom,$env{'form.defaultdomain'})) &&
(&Apache::lonnet::will_trust('coaurem',$env{'form.defaultdomain'},$defdom))) {
$domain = $env{'form.defaultdomain'};
@@ -4189,19 +4200,26 @@ sub upfile_drop_add {
$r->print(''.&mt('Error').
&mt('Addition of users not permitted for specified default domain: [_1].',
&Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'');
- $r->print(&Apache::loncommon::end_page());
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('');
+ }
+ return;
}
- return;
}
} elsif (($context eq 'domain') && ($setting eq 'domain')) {
- unless ($env{'form.defaultdomain'} eq $defdom) {
+ if ($env{'form.defaultdomain'} eq $defdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
if (&Apache::lonnet::will_trust('domroles',$defdom,$env{'form.defaultdomain'})) {
$domain = $env{'form.defaultdomain'};
} else {
$r->print(''.&mt('Error').
&mt('Addition of users not permitted for specified default domain: [_1].',
&Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'');
- $r->print(&Apache::loncommon::end_page());
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('');
+ }
+ return;
}
}
}
@@ -4216,7 +4234,9 @@ sub upfile_drop_add {
if (! exists($home_servers{$desiredhost})) {
$r->print(''.&mt('Error').
&mt('Invalid home server specified').'');
- $r->print(&Apache::loncommon::end_page());
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('');
+ }
return;
}
}