--- loncom/homework/structuretags.pm	2006/04/20 19:08:41	1.332.2.3
+++ loncom/homework/structuretags.pm	2006/03/02 21:20:30	1.337
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.332.2.3 2006/04/20 19:08:41 albertel Exp $
+# $Id: structuretags.pm,v 1.337 2006/03/02 21:20:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,7 @@ BEGIN {
 sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'web') {
 	return $bodytext;
     }
     return '';
@@ -156,9 +156,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); }
+	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
+	my $uri = &Apache::lonenc::check_encrypted($env{'request.uri'});
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -192,8 +191,10 @@ sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();
-    if ($env{'request.state'} eq "construct" || $symb eq '' ||
-          $Apache::lonhomework::history{'resource.CODE'}) {
+    if ($env{'request.state'} eq "construct" 
+	|| $symb eq '' 
+	|| $Apache::lonhomework::type eq 'practice'
+	|| $Apache::lonhomework::history{'resource.CODE'}) {
 	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						['rndseed']);
 	$rndseed=$env{'form.rndseed'};
@@ -336,9 +337,19 @@ 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::type eq 'practice') {
+	
+	my $namespace = $symb || $env{'request.uri'};
+	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
+	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
+	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
+	    &Apache::lonxml::debug("Attempt reset");
+	}
 	%Apache::lonhomework::history=
-	    &Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name);
+	    &Apache::lonnet::tmprestore($namespace,'',$domain,$name);
 	my ($temp)=keys %Apache::lonhomework::history ;
 	&Apache::lonxml::debug("Return message of $temp");
     } else {
@@ -362,10 +373,13 @@ sub finalize_storage {
 	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
 	delete(@Apache::lonhomework::results{@remove});
 	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::type eq 'practice') {
+	    my $namespace = $symb || $env{'request.uri'};
 	    $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
 	    $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
-					$env{'request.uri'},'',$domain,$name);
+					      $namespace,'',$domain,$name);
 	    &Apache::lonxml::debug('Construct Store return message:'.$result);
 	} else {
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
@@ -429,14 +443,13 @@ 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="$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>
@@ -448,10 +461,9 @@ 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="$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>
@@ -610,14 +622,18 @@ sub start_problem {
 	#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 '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
 		    '<input type="submit" name="resetdata"
-                             value="'.&mt('New Problem Variation').'" />'.
+                             value="'.&mt('New Problem Variation').'" />';
+	    if (exists($env{'form.username'})) {
+		$form_tag_start.=
 		    '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';
-	    if ($env{'user.adv'}) {
+	    }
+	    if ($env{'request.role.adv'}) {
 		$form_tag_start.=
 		    ' <label><input type="checkbox" name="showallfoils" ';
 		if (defined($env{'form.showallfoils'})) {
@@ -982,8 +998,8 @@ sub start_block {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer'  ||
-	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $code = $token->[2]->{'condition'};
 	if (defined($code)) {
 	    if (!$Apache::lonxml::default_homework_loaded) {
@@ -1026,8 +1042,8 @@ sub start_languageblock {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
         my %languages=&Apache::loncommon::display_languages();
@@ -1079,8 +1095,8 @@ sub start_instructorcomment {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+    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')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
@@ -1108,8 +1124,8 @@ sub start_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
-    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $code = $token->[2]->{'condition'};
 
 	push( @Apache::structuretags::whileconds, $code);
@@ -1141,8 +1157,8 @@ sub end_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $code = pop(@Apache::structuretags::whileconds);
 	my $bodytext = pop(@Apache::structuretags::whilebody);
 	my $line = pop(@Apache::structuretags::whileline);
@@ -1175,8 +1191,8 @@ sub end_while {
 sub start_randomlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'answer' || $target eq 'grade'   || $target eq 'web' ||
-	$target eq 'tex'    || $target eq 'analyze' || $target eq 'webgrade') {
+    if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
 	my $b_parser= HTML::LCParser->new(\$body);
 	$b_parser->xml_mode(1);
@@ -1416,8 +1432,7 @@ sub end_part {
 
 sub start_preduedate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade'    || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
 	&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
 	if (!$Apache::lonhomework::scantronmode &&
 	    $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
@@ -1435,7 +1450,7 @@ sub end_preduedate {
 
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade') {
 	if ($Apache::lonhomework::scantronmode ||
 	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
@@ -1453,7 +1468,7 @@ sub end_postanswerdate {
 sub start_notsolved {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'webgrade') {
+	$target eq 'tex') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	&Apache::lonxml::debug("not solved has :$gradestatus:");
 	if ($gradestatus =~ /^correct/ &&
@@ -1489,8 +1504,8 @@ sub end_solved {
 sub start_problemtype {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
 	if (!defined($mode)) { $mode='show'; }
 	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);