--- loncom/imspackages/imsprocessor.pm 2005/03/23 20:55:33 1.18 +++ loncom/imspackages/imsprocessor.pm 2005/04/07 06:56:22 1.19 @@ -95,7 +95,7 @@ sub uploadzip { my ($context,$tempdir,$source) = @_; my $fname; if ($context eq 'DOCS') { - $fname=$ENV{'form.uploadname.filename'}; + $fname=$env{'form.uploadname.filename'}; # Replace Windows backslashes by forward slashes $fname=~s/\\/\//g; # Get rid of everything but the actual filename @@ -107,9 +107,9 @@ sub uploadzip { # See if there is anything left unless ($fname) { return 'error: no uploaded file'; } # Save the file - chomp($ENV{'form.uploadname'}); + chomp($env{'form.uploadname'}); open(my $fh,'>'.$tempdir.'/'.$fname); - print $fh $ENV{'form.uploadname'}; + print $fh $env{'form.uploadname'}; close($fh); } elsif ($context eq 'CSTR') { if ($source =~ m/\/([^\/]+)$/) { @@ -128,14 +128,8 @@ sub expand_zip { return 'no zip'; } if ($filename =~ m|\.zip$|i) { - # unzip can cause an sh launch which can pass along all of %ENV - # which can be too large for /bin/sh to handle - my %oldENV=%ENV; - undef(%ENV); open(OUTPUT, "unzip -o $zipfile -d $tempdir 2> /dev/null |"); close(OUTPUT); - %ENV=%oldENV; - undef(%oldENV); } else { return 'nozip'; } @@ -2290,7 +2284,7 @@ sub process_assessment { my $randompickflag = 0; my ($cid,$cdom,$cnum); if ($context eq 'DOCS') { - $cid = $ENV{'request.course.id'}; + $cid = $env{'request.course.id'}; ($cdom,$cnum) = split/_/,$cid; } my $destresdir = $destdir;