--- loncom/homework/structuretags.pm	2006/04/14 21:09:54	1.344
+++ loncom/homework/structuretags.pm	2006/04/28 18:34:22	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.344 2006/04/14 21:09:54 albertel Exp $
+# $Id: structuretags.pm,v 1.354 2006/04/28 18:34:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,8 @@ sub end_tex {
 }
 
 sub page_start {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
+	$extra_head)=@_;
     my %found;
     foreach my $taginside (@$tagstack) {
 	foreach my $taglookedfor ('html','body','form') {
@@ -78,7 +79,6 @@ sub page_start {
 	}
     }
 
-
     if ($target eq 'tex') {
 	return
 	    &Apache::londefdef::start_html($target,$token,$tagstack,
@@ -86,12 +86,11 @@ sub page_start {
     }
 
     my %body_args;
-    my $extra_head;
     if (defined($found{'html'})) {
 	$body_args{'skip_phases'}{'head'}=1;
     } else {
 	
-	$extra_head = &Apache::lonhtmlcommon::spellheader();
+	$extra_head .= &Apache::lonhtmlcommon::spellheader();
 
 	my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
 	if ($css_href =~ /\S/) {
@@ -162,7 +161,6 @@ sub page_start {
 	}
 	$form_tag_start.='>';
     }
-
     return ($page_start,$form_tag_start);
 }
 
@@ -250,7 +248,7 @@ sub problem_edit_header {
 sub problem_edit_footer {
     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
-    &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+    &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();
 }
 
@@ -333,9 +331,16 @@ Feedback Mode:
 }
 
 sub initialize_storage {
-    %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=();
+    undef(%Apache::lonhomework::results);
+    undef(%Apache::lonhomework::history);
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    
+    # anonymous users (CODEd exams) have no data
+    if ($name eq 'anonymous' 
+	&& !defined($domain)) {
+	return;
+    }
+
     if ($env{'request.state'} eq 'construct' 
 	|| $symb eq ''
 	|| $Apache::lonhomework::type eq 'practice') {
@@ -355,6 +360,7 @@ sub initialize_storage {
 	%Apache::lonhomework::history=
 	    &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }
+
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
@@ -442,13 +448,14 @@ sub checkout_msg {
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
                 'checkout'=>'Check out Exam for Viewing',
 		'checkout?'=>'Check out Exam?');
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
 <font color="red">
 <p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="POST" action="$env{'request.uri'}">
+<form name="checkout" method="POST" action="$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>
@@ -460,9 +467,10 @@ sub firstaccess_msg {
     my ($map)=&Apache::lonnet::decode_symb($symb);
     my $foldertitle=&Apache::lonnet::gettitle($map);
     &Apache::lonxml::debug("map is $map title is $foldertitle");
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     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="$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>
@@ -596,11 +604,15 @@ sub start_problem {
     my $status;
     my $accessmsg;
 
-    #should get back a <html> or the neccesary stuff to start XML/MathML
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start)=
-	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
-		    $name);
+    my ($result,$form_tag_start);
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
+	|| $target eq 'edit') {
+	($result,$form_tag_start) =
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			$name);
+    }
+
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
 
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
@@ -862,10 +874,10 @@ sub end_problem {
 	    if ($target ne 'tex' &&
 		$env{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
-		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
+		$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
 	    }
 	    if ($target eq 'web') {
-		$result.=&Apache::lonxml::xmlend().'</html>';
+		$result.= &Apache::loncommon::end_page({'discussion' => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $env{'form.problem_split'}=~/yes/) {
@@ -873,7 +885,6 @@ sub end_problem {
 		}
                 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_/) {
@@ -890,7 +901,7 @@ sub end_problem {
 	}
 	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
 	    && $env{'form.answer_output_mode'} ne 'tex') {
-	    $result.=&Apache::lonxml::xmlend().'</html>';
+	    $result.=&Apache::loncommon::end_page({'discussion' => 1});
 	                        # normally we get it from above, but in CSTR
 	                        # we always show answer mode too.
 	}
@@ -958,7 +969,7 @@ sub end_library {
 	$result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
 	     $env{'request.state'} eq "construct") {
-	$result.='</form>'.&Apache::lonxml::xmlend();
+	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;