--- loncom/homework/grades.pm	2018/04/29 15:29:05	1.596.2.12.2.41.2.2
+++ loncom/homework/grades.pm	2018/04/29 15:05:25	1.596.2.12.2.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.41.2.2 2018/04/29 15:29:05 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12.2.42 2018/04/29 15:05:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4214,7 +4214,7 @@ sub editgrades {
 	my ($uname,$udom)=split(/:/,$user);
 	my %newrecord;
 	my $updateflag = 0;
-	my $usec=$classlist->{"$uname:$udom"}[5];
+        my $usec=$classlist->{"$uname:$udom"}[5];
         my $canmodify = &canmodify($usec);
         my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
                    &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
@@ -4606,10 +4606,8 @@ sub csvuploadmap {
     if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($request);
     } else {
-        $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-        if ($datatoken ne '') {
-            &Apache::loncommon::load_tmp_file($request,$datatoken);
-        }
+	$datatoken=$env{'form.datatoken'};
+	&Apache::loncommon::load_tmp_file($request);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@records); }
@@ -4713,10 +4711,7 @@ sub csvuploadassign {
     my ($symb)=&get_symb($request);
     if (!$symb) {return '';}
     my $error_msg = '';
-    my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-    if ($datatoken ne '') {
-        &Apache::loncommon::load_tmp_file($request,$datatoken);
-    }
+    &Apache::loncommon::load_tmp_file($request);
     my @gradedata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@gradedata); }
     my %fields=&get_fields();