--- loncom/homework/structuretags.pm	2005/04/01 18:08:14	1.283
+++ loncom/homework/structuretags.pm	2005/04/07 06:56:22	1.284
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.283 2005/04/01 18:08:14 albertel Exp $
+# $Id: structuretags.pm,v 1.284 2005/04/07 06:56:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,8 +88,8 @@ sub page_start {
 	    &Apache::lonxml::fontsettings();     
     }
     my $body_tag_start;
-    if (!defined($found{'body'}) && $ENV{'request.state'} eq 'construct'
-	&& $ENV{'environment.remote'} eq 'off') {
+    if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
+	&& $env{'environment.remote'} eq 'off') {
 	$body_tag_start=&Apache::loncommon::bodytag();
 	$body_tag_start.=&Apache::lonxml::message_location();
     } elsif (!defined($found{'body'})) {
@@ -97,7 +97,7 @@ sub page_start {
 	    'onunload="'.&Apache::lonmenu::unloadevents().'" ';
 	my $background=&Apache::lonxml::get_param('background',$parstack,
 						  $safeeval);
-	if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
+	if ($env{'browser.imagesuppress'} eq 'on') { $background=''; }
 	if ($background) {
 	    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
 		$background;
@@ -105,23 +105,23 @@ sub page_start {
 	} else {
 	    my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
 						   $safeeval);
-	    if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
+	    if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) {
 		$body_tag_start.='bgcolor="'.$bgcolor.'" ';
 	    } else {
 		$body_tag_start.='bgcolor="#ffffff"';
 	    }
 	}
-	if ($ENV{'browser.fontenhance'} eq 'on') {
+	if ($env{'browser.fontenhance'} eq 'on') {
 	    $body_tag_start.=' style="font-size: x-large;" ';
 	}
 	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
-	if ($ENV{'environment.texengine'} eq 'jsMath') {
+	if ($env{'environment.texengine'} eq 'jsMath') {
 	    $body_tag_start.='<script type="text/javascript">
                      function NoFontMessage () {}
                    </script>'."\n".
 		       '<script src="/adm/jsMath/jsMath.js"></script>'."\n";
 	}
-	if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
+	if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	    my ($symb,undef,undef,undef,$publicuser)=
 		&Apache::lonxml::whichuser();
 	    if ($symb eq '' && !$publicuser) {
@@ -135,8 +135,8 @@ sub page_start {
     my $form_tag_start;
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="';
-	my $uri=$ENV{'request.uri'};
-	if ($ENV{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+	my $uri=$env{'request.uri'};
+	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
 	$form_tag_start.=$uri.'">';
     }
     return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
@@ -155,7 +155,7 @@ sub get_resource_name {
 	if ($name eq 'con_lost') { $name = ''; }
     }
     if ($name!~/\S+/) {
-	$name=$ENV{'request.uri'};
+	$name=$env{'request.uri'};
 	$name=~s-.*/([^/]+)$-$1-;
     }
     $Apache::lonhomework::name=$name;
@@ -166,23 +166,23 @@ sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq "construct" || $symb eq '' ||
+    if ($env{'request.state'} eq "construct" || $symb eq '' ||
           $Apache::lonhomework::history{'resource.CODE'}) {
-	$rndseed=$ENV{'form.rndseed'};
+	$rndseed=$env{'form.rndseed'};
 	if (!$rndseed) {
 	    $rndseed=$Apache::lonhomework::history{'rndseed'};
 	    if (!$rndseed) {
 		$rndseed=time;
 	    }
-	    $ENV{'form.rndseed'}=$rndseed;
+	    $env{'form.rndseed'}=$rndseed;
 	}
-	if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
-	    $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
+	if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
-	    $ENV{'form.rndseed'}=$rndseed;
-	    delete($ENV{'form.resetdata'});
-	    delete($ENV{'form.newrandomization'});
+	    $env{'form.rndseed'}=$rndseed;
+	    delete($env{'form.resetdata'});
+	    delete($env{'form.newrandomization'});
 	}
 	if (defined($rndseed) && $rndseed ne int($rndseed)) {
 	   $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
@@ -200,9 +200,9 @@ sub setup_rndseed {
 
 sub remember_problem_state {
     return '
-       <input type="hidden" name="problemstate" value="'.$ENV{'form.problemstate'}.'" />
-       <input type="hidden" name="problemtype" value="'.$ENV{'form.problemtype'}.'" />
-       <input type="hidden" name="problemstatus" value="'.$ENV{'form.problemstatus'}.'" />';
+       <input type="hidden" name="problemstate" value="'.$env{'form.problemstate'}.'" />
+       <input type="hidden" name="problemtype" value="'.$env{'form.problemtype'}.'" />
+       <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
 sub problem_edit_header {
@@ -229,7 +229,7 @@ sub problem_edit_footer {
 sub option {
     my ($value,$name) = @_;
     my $result ="<option value='".$value."' ";
-    if ($ENV{'form.'.$name} eq $value) {
+    if ($env{'form.'.$name} eq $value) {
 	$result.=" selected='on' ";
     }
     $result.='>';
@@ -248,7 +248,7 @@ sub problem_web_to_edit_header {
 	       $rndseed.'"
            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <label><input type="checkbox" name="showallfoils" ';
-    if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
+    if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
 	'</label><hr />';
@@ -283,7 +283,7 @@ Feedback Mode:
 </nobr>
 <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
 <hr />";
-    my $numtoanalyze=$ENV{'form.numtoanalyze'};
+    my $numtoanalyze=$env{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
     $result.= '<input type="submit" name="problemmode" value='.
 	&mt('"Calculate answers').'" /> for
@@ -299,9 +299,9 @@ sub initialize_storage {
     %Apache::lonhomework::results=();
     %Apache::lonhomework::history=();
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
+    if ($env{'request.state'} eq 'construct' || $symb eq '') {
 	%Apache::lonhomework::history=
-	    &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
+	    &Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name);
 	my ($temp)=keys %Apache::lonhomework::history ;
 	&Apache::lonxml::debug("Return message of $temp");
     } else {
@@ -322,10 +322,10 @@ sub finalize_storage {
     my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {
 	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-	if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
-	    $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};
+	if ($env{'request.state'} eq 'construct' || $symb eq '') {
+	    $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
 	    $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
-					$ENV{'request.uri'},'',$domain,$name);
+					$env{'request.uri'},'',$domain,$name);
 	    &Apache::lonxml::debug('Construct Store return message:'.$result);
 	} else {
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
@@ -349,7 +349,7 @@ sub checkout_msg {
 <font color="red">
 <p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="POST" action="$ENV{'request.uri'}">
+<form name="checkout" method="POST" action="$env{'request.uri'}">
 <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
@@ -363,7 +363,7 @@ sub firstaccess_msg {
     &Apache::lonxml::debug("map is $map title is $foldertitle");
     return (<<ENDCHECKOUT);
 <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
-<form name="markaccess" method="POST" action="$ENV{'request.uri'}">
+<form name="markaccess" method="POST" action="$env{'request.uri'}">
 <input type="hidden" name="markaccess" value="yes" />
 <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
 </form>
@@ -410,7 +410,7 @@ sub reset_problem_globals {
 
 sub set_problem_state {
     my ($part)=@_;
-    if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+    if ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
 	$Apache::lonhomework::history{"resource.$part.solved"}=
 	    'correct_by_student';
     }
@@ -419,13 +419,13 @@ sub set_problem_state {
 sub get_problem_status {
     my ($part)=@_;
     my $problem_status;
-    if ($ENV{'request.state'} eq 'construct' &&
-	defined($ENV{'form.problemstatus'})) {
-	$problem_status=$ENV{'form.problemstatus'};
+    if ($env{'request.state'} eq 'construct' &&
+	defined($env{'form.problemstatus'})) {
+	$problem_status=$env{'form.problemstatus'};
     } else {
 	$problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
 	&Apache::lonxml::debug("problem status for $part is $problem_status");
-	&Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+	&Apache::lonxml::debug("env probstat is ".$env{'form.problemstatus'});
     }
     return $problem_status;
 }
@@ -443,7 +443,7 @@ sub start_problem {
     $Apache::lonhomework::parsing_a_problem=1;
     &init_problem_globals('problem');
 
-    if (defined($ENV{'scantron.maxquest'})) {
+    if (defined($env{'scantron.maxquest'})) {
 	$Apache::lonhomework::scantronmode=1;
     }
 
@@ -452,16 +452,16 @@ sub start_problem {
 	if ($target eq 'web') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
 	}
-       	if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
+       	if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
-	if (($ENV{'request.state'} eq 'construct') &&
-	    defined($ENV{'form.problemtype'})) {
-	    $Apache::lonhomework::type=$ENV{'form.problemtype'};
+	if (($env{'request.state'} eq 'construct') &&
+	    defined($env{'form.problemtype'})) {
+	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
 	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
-	my $uri=$ENV{'request.uri'};
+	my $uri=$env{'request.uri'};
 	if ($uri=~/\.(\w+)$/) {
 	    $Apache::lonhomework::type=$1;
 	    &Apache::lonxml::debug("Using type of $1");
@@ -481,7 +481,7 @@ sub start_problem {
     #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
-    if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) {$result='';}
+    if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
 
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
@@ -490,30 +490,30 @@ sub start_problem {
 	if ($Apache::lonhomework::type eq 'exam') {
 	    my $token=
 		$Apache::lonhomework::history{"resource.0.outtoken"};
-	    if (($ENV{'form.doescheckout'}) && (!$token)) {
+	    if (($env{'form.doescheckout'}) && (!$token)) {
 		$token=&Apache::lonxml::maketoken();
 		$Apache::lonhomework::history{"resource.0.outtoken"}=
 		    $token;
 	    }
 	    $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
 	}
-	if ($ENV{'form.markaccess'}) {
+	if ($env{'form.markaccess'}) {
 	    &Apache::lonnet::set_first_access('map');
 	}
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
 	my ($symb)=&Apache::lonxml::whichuser();
-	if ($ENV{'request.state'} ne "construct" && $symb eq '') {
+	if ($env{'request.state'} ne "construct" && $symb eq '') {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
 		    '<input type="submit" name="resetdata"
                              value="'.&mt('New Problem Variation').'" />'.
 		    '<input type="hidden" name="username"
-                             value="'.$ENV{'form.username'}.'" />';
-	    if ($ENV{'user.adv'}) {
+                             value="'.$env{'form.username'}.'" />';
+	    if ($env{'user.adv'}) {
 		$form_tag_start.=
 		    ' <input type="checkbox" name="showallfoils" ';
-		if (defined($ENV{'form.showallfoils'})) {
+		if (defined($env{'form.showallfoils'})) {
 		    $form_tag_start.='checked="on"';
 		}
 		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');
@@ -563,24 +563,24 @@ sub start_problem {
               $body_tag_start \n $form_tag_start".	
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # create a page header and exit
-	    if ($ENV{'request.state'} eq "construct") {
-		$result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+	    if ($env{'request.state'} eq "construct") {
+		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
 	    }
 	    # if we are viewing someone else preserve that info
-	    if (defined $ENV{'form.grade_symb'}) {
+	    if (defined $env{'form.grade_symb'}) {
 		foreach my $field ('symb','courseid','domain','username') {
 		    $result .= '<input type="hidden" name="grade_'.$field.
-			'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
 	    }
 	} elsif ($target eq 'tex') {
 	    my $startminipage = '';
-	    if (not $ENV{'form.problem_split'}=~/yes/) {
+	    if (not $env{'form.problem_split'}=~/yes/) {
 		$startminipage = '\begin{minipage}{\textwidth}';
 	    }
 	    my $id = $Apache::inputtags::part;
 	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-	    my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+	    my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
 	    my @packages = split /,/,$packages;
 	    my $allow_print_points = 0;
 	    foreach my $partial_key (@packages) {
@@ -593,7 +593,7 @@ sub start_problem {
 	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	    $duedate = POSIX::strftime("%c",localtime($duedate));
 	    my $temp_file;
-	    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+	    my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	    if (-e $filename) {
 		$temp_file = Apache::File->new($filename);
 	    } else {
@@ -606,19 +606,19 @@ sub start_problem {
 	    if ($due_file_content ne $duedate) {
 		$temp_file = Apache::File->new('>'.$filename);
 		print $temp_file "$duedate\n";
-		if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		if (not $env{'request.symb'} =~ m/\.page_/) {
 		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
 		    } else {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
 			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		    }
 		} else {
 		    $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
 		}
 	    } else {
-		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
+		if (not $env{'request.symb'} =~ m/\.page_/) {
+		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
 		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} else {
 		    $result .= '\vskip 1mm \\\\\\\\';
@@ -665,11 +665,11 @@ sub end_problem {
 	    $result.= $gradestatus;
 	}
 	if (
-	    (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($target ne 'tex' &&
-		$ENV{'form.answer_output_mode'} ne 'tex') {
+		$env{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
 		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
 	    }
@@ -677,15 +677,15 @@ sub end_problem {
 		$result.=&Apache::lonxml::xmlend().'</html>';
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
-		if (not $ENV{'form.problem_split'}=~/yes/) {
+		if (not $env{'form.problem_split'}=~/yes/) {
 		    $endminipage = '\end{minipage}';
 		}
-                if ($ENV{'form.print_discussions'} eq 'yes') {
+                if ($env{'form.print_discussions'} eq 'yes') {
 		    $result.=&Apache::lonxml::xmlend($target,$parser);
 		    $result=~s/<\/html>//;
 		} else {
 		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
-		    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+		    if (not $env{'request.symb'} =~ m/\.page_/) {
 			$result .= $endminipage.'\end{document} ';
 		    } else {
 			$result .= '';
@@ -697,8 +697,8 @@ sub end_problem {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
 	}
-	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
-	    && $ENV{'form.answer_output_mode'} ne 'tex') {
+	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
+	    && $env{'form.answer_output_mode'} ne 'tex') {
 	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
 	                        # we always show answer mode too.
 	}
@@ -714,7 +714,7 @@ sub end_problem {
 	$result = &problem_edit_footer();
     }
 
-    if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+    if ($env{'request.state'} eq 'construct' && $target eq 'web') {
 	&Apache::inputtags::check_for_duplicate_ids();
     }
 
@@ -742,7 +742,7 @@ sub start_library {
 	$result=$token->[4];
 	$result.=&Apache::edit::handle_insert();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $ENV{'request.state'} eq "construct" ) {
+	     $env{'request.state'} eq "construct" ) {
 	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
 	my $name=&get_resource_name($parstack,$safeeval);
@@ -761,7 +761,7 @@ sub end_library {
     if ($target eq 'edit') {
 	$result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $ENV{'request.state'} eq "construct") {
+	     $env{'request.state'} eq "construct") {
 	$result.='</form>'.&Apache::loncommon::endbodytag().
 	    &Apache::lonxml::xmlend();
     }
@@ -897,8 +897,8 @@ sub start_instructorcomment {
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
-        $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
-	if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {
+        $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
+	if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
 						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
@@ -1110,7 +1110,7 @@ sub start_part {
 	    my $expression='$external::datestatus="'.$status.'";';
 	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
 	    &Apache::run::run($expression,$safeeval);
-	    if ($ENV{'request.state'} eq 'construct') {
+	    if ($env{'request.state'} eq 'construct') {
 		&set_problem_state($Apache::inputtags::part); 
 	    }
 	    if (( $status eq 'CLOSED' ) ||
@@ -1123,7 +1123,7 @@ sub start_part {
 		if ( $target eq "web" ) {
 		    $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
 		} elsif ( $target eq 'tex' ) {
-		    if (not $ENV{'form.problem_split'}=~/yes/) {
+		    if (not $env{'form.problem_split'}=~/yes/) {
 			$result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";
 		    } else {
 			$result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
@@ -1131,7 +1131,7 @@ sub start_part {
 		}
 	    } else {
 		if ($target eq 'tex') {
-		    if (not $ENV{'form.problem_split'}=~/yes/) {
+		    if (not $env{'form.problem_split'}=~/yes/) {
 			if ($$tagstack[-2] eq 'td') {
 			    $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
 			} else {
@@ -1139,7 +1139,7 @@ sub start_part {
 			}
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+		    my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
 		    my @allkeys = split /,/,$allkeys;
 		    my $allow_print_points = 0;
 		    foreach my $partial_key (@allkeys) {
@@ -1390,10 +1390,10 @@ sub delete_startouttext {
 sub start_simpleeditbutton {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    if (($ENV{'form.simple_edit_button'} ne 'off') &&
+    if (($env{'form.simple_edit_button'} ne 'off') &&
 	($target eq 'web') &&
-        (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-        my $url=$ENV{'request.noversionuri'};
+        (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+        my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
 	my ($symb) = &Apache::lonxml::whichuser();
 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.