--- loncom/interface/slotrequest.pm	2020/04/08 20:06:59	1.125.2.3.4.2
+++ loncom/interface/slotrequest.pm	2019/07/07 22:06:50	1.125.2.8
@@ -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.125.2.3.4.2 2020/04/08 20:06:59 raeburn Exp $
+# $Id: slotrequest.pm,v 1.125.2.8 2019/07/07 22:06:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -962,7 +962,7 @@ sub update_selectable {
     if ($passed_resource->is_map()) {
         my ($a_resource) =
             $navmap->retrieveResources($passed_resource,
-                                       sub {$_[0]->is_problem()},0,1);
+                                       sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1);
         $symb_for_parm = $a_resource->symb();
     }
     # get parameter string, check for existence, rebuild string with the slot
@@ -2894,8 +2894,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); }
@@ -2945,7 +2947,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();