--- loncom/interface/lonuserutils.pm 2017/08/08 15:34:32 1.186 +++ loncom/interface/lonuserutils.pm 2017/11/04 20:59:39 1.193 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.186 2017/08/08 15:34:32 raeburn Exp $ +# $Id: lonuserutils.pm,v 1.193 2017/11/04 20:59:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -943,14 +943,14 @@ sub print_upload_manager_footer { &Apache::lonhtmlcommon::row_closure(); } - my ($trustedref,$untrustedref); + my ($trusted,$untrusted); if ($context eq 'course') { - ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('enroll',$defdom); + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom); } elsif ($context eq 'author') { - ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('othcoau',$defdom); + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom); } $Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain')) - .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trustedref,$untrustedref) + .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trusted,$untrusted) .&Apache::lonhtmlcommon::row_closure(); $Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates')) @@ -1127,8 +1127,15 @@ 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); + } + } + if ($datatoken eq '') { + $r->print('
'.&mt('Error').': '. + &mt('Invalid datatoken').'
'); + return 'missingdata'; } my @records=&Apache::loncommon::upfile_record_sep(); if($env{'form.noFirstLine'}){ @@ -1212,6 +1219,7 @@ sub print_upload_manager_form { } &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear, $context,$permission,$crstype,$showcredits); + return 'ok'; } sub setup_date_selectors { @@ -2342,7 +2350,8 @@ function setCourseCat(formname) { } courseSet('$codetitles[1]'); for (var j=0; j