--- loncom/homework/inputtags.pm	2005/04/05 15:39:41	1.164
+++ loncom/homework/inputtags.pm	2005/04/07 06:56:21	1.165
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.164 2005/04/05 15:39:41 albertel Exp $
+# $Id: inputtags.pm,v 1.165 2005/04/07 06:56:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ use HTML::Entities();
 use strict;
 use Apache::loncommon;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
@@ -148,9 +149,9 @@ sub start_textfield {
 	}
     } elsif ($target eq 'grade') {
 	my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
-	if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) {
+	if ($seedtext eq $env{'form.HWVAL_'.$resid}) {
 	    # if the seed text is still there it wasn't a real submission
-	    $ENV{'form.HWVAL_'.$resid}='';
+	    $env{'form.HWVAL_'.$resid}='';
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
@@ -421,8 +422,8 @@ sub decideoutput {
 		$message.=" ".&mt("Computer's answer now shown above.");
 	    }
 	    $added_computer_text=1;
-	    unless ($ENV{'course.'.
-			     $ENV{'request.course.id'}.
+	    unless ($env{'course.'.
+			     $env{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') { 
 		$message.=(($target eq 'web')?'<br />':' ').
 		    &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
@@ -454,8 +455,8 @@ sub decideoutput {
 		$message.=" ".&mt("Computer's answer now shown above.");
 	    }
 	    $added_computer_text=1;
-	    unless ($ENV{'course.'.
-			     $ENV{'request.course.id'}.
+	    unless ($env{'course.'.
+			     $env{'request.course.id'}.
 			     '.disable_receipt_display'} eq 'yes') { 
 		$message.=(($target eq 'web')?'<br />':' ').
 		    'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
@@ -609,10 +610,10 @@ sub hidealldata {
 sub setgradedata {
     my ($award,$msg,$id,$previously_used) = @_;
     if ($Apache::lonhomework::scantronmode && 
-	&Apache::lonnet::validCODE($ENV{'form.CODE'})) {
-	$Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'};
+	&Apache::lonnet::validCODE($env{'form.CODE'})) {
+	$Apache::lonhomework::results{"resource.CODE"}=$env{'form.CODE'};
     } elsif ($Apache::lonhomework::scantronmode && 
-	     $ENV{'form.CODE'} eq '' &&
+	     $env{'form.CODE'} eq '' &&
 	     $Apache::lonhomework::history{"resource.CODE"} ne '') {
 	$Apache::lonhomework::results{"resource.CODE"}='';
     }
@@ -729,7 +730,7 @@ sub grade {
     my ($target) = @_;
     my $id = $Apache::inputtags::part;
     my $response='';
-    if ( defined $ENV{'form.submitted'}) {
+    if ( defined $env{'form.submitted'}) {
 	my (@awards,@msgs);
 	foreach $response (@Apache::inputtags::response) {
 	    &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
@@ -814,7 +815,7 @@ sub gradestatus {
 	}
 	if ( $showbutton ) {
 	    if ($target eq 'tex') {
-		if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') {
+		if ($env{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $env{'form.suppress_tries'} ne 'yes') {
 		    $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
 		} else {
 		    $trystr = '\vskip 0 mm ';
@@ -822,7 +823,7 @@ sub gradestatus {
 	    } else {
 		$trystr = "<td><nobr>".$tries_text." $tries";
 		if ($Apache::lonhomework::parsing_a_task) {
-		} elsif($ENV{'request.state'} ne 'construct') {
+		} elsif($env{'request.state'} ne 'construct') {
 		    $trystr.="/$maxtries";
 		} else {
 		    if (defined($Apache::inputtags::params{'maxtries'})) {