--- loncom/interface/slotrequest.pm	2016/10/12 14:16:09	1.133
+++ loncom/interface/slotrequest.pm	2017/08/11 18:58:16	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.133 2016/10/12 14:16:09 raeburn Exp $
+# $Id: slotrequest.pm,v 1.135 2017/08/11 18:58:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1769,7 +1769,7 @@ sub show_table {
                                                slotlog => 'History',
         );
         my ($edit,$delete,$showlog,$remove_all);
-        if ($mgr) { 
+        if ($mgr) {
 	    $edit=(<<"EDITLINK");
 <a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a>
 EDITLINK
@@ -2945,8 +2945,10 @@ sub csv_upload_map {
     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'}) { shift(@records); }
@@ -2997,7 +2999,10 @@ sub csvupload_fields {
 
 sub csv_upload_assign {
     my ($r,$mgr)= @_;
-    &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 @slotdata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@slotdata); }
     my %fields=&Apache::grades::get_fields();