--- loncom/homework/structuretags.pm	2005/12/15 23:20:55	1.327
+++ loncom/homework/structuretags.pm	2006/03/30 20:16:14	1.340
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.327 2005/12/15 23:20:55 albertel Exp $
+# $Id: structuretags.pm,v 1.340 2006/03/30 20:16:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
+use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );
 BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
@@ -44,7 +45,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') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	return $bodytext;
     }
     return '';
@@ -113,6 +114,12 @@ sub page_start {
 	    &Apache::lonhtmlcommon::htmlareaheaders().
 	    &Apache::lonhtmlcommon::spellheader().
 	    &Apache::lonxml::fontsettings();     
+	my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
+	if ($css_href =~ /\S/) {
+	    &Apache::lonxml::extlink($css_href);
+	    $head_tag_start = 
+		'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
+	}
 	if ($target eq 'edit') {
 	    $head_tag_start.=&Apache::edit::js_change_detection();
 	}
@@ -150,9 +157,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_encrypt($env{'request.uri'});
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -186,8 +192,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'};
@@ -232,7 +240,7 @@ sub problem_edit_header {
 	&Apache::structuretags::remember_problem_state().'
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-       <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
@@ -330,9 +338,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 {
@@ -356,10 +374,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,
@@ -556,7 +577,7 @@ sub start_problem {
 	    defined($env{'form.problemtype'})) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
-	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
+	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
 	my $uri=$env{'request.uri'};
@@ -602,14 +623,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'})) {
@@ -658,7 +683,10 @@ sub start_problem {
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
-		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
+		my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
+		                    : '\begin{minipage}{\textwidth}';
+		$result.='\begin{document}\noindent \vskip 1 mm '.
+		    $startminipage.'\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
 		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
 		} else {
@@ -719,6 +747,7 @@ sub end_problem {
 
     if (!$Apache::lonxml::metamode) {
 	$result = &Apache::lonxml::endredirection(); #started in &start_problem
+	$Apache::lonxml::post_evaluate=0;
     }
 
     if ($target eq 'tex') {
@@ -913,8 +942,9 @@ sub start_library {
     } elsif ($target eq 'modified') {
 	$result=$token->[4];
 	$result.=&Apache::edit::handle_insert();
-    } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $env{'request.state'} eq "construct" ) {
+    } elsif (($target eq 'web' || $target eq 'webgrade')
+	     && $$tagstack[0] eq 'library' 
+	     && $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);
@@ -970,8 +1000,8 @@ sub start_block {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer'  ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = $token->[2]->{'condition'};
 	if (defined($code)) {
 	    if (!$Apache::lonxml::default_homework_loaded) {
@@ -1014,8 +1044,8 @@ sub start_languageblock {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
         my %languages=&Apache::loncommon::display_languages();
@@ -1067,8 +1097,8 @@ sub start_instructorcomment {
 
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
         $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",
@@ -1096,8 +1126,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') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = $token->[2]->{'condition'};
 
 	push( @Apache::structuretags::whileconds, $code);
@@ -1129,8 +1159,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') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = pop(@Apache::structuretags::whileconds);
 	my $bodytext = pop(@Apache::structuretags::whilebody);
 	my $line = pop(@Apache::structuretags::whileline);
@@ -1163,9 +1193,9 @@ 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') {
-	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser,$style);
+    if ($target eq 'answer' || $target eq 'grade'   || $target eq 'web' ||
+	$target eq 'tex'    || $target eq 'analyze' || $target eq 'webgrade') {
+	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
 	my $b_parser= HTML::LCParser->new(\$body);
 	$b_parser->xml_mode(1);
 	$b_parser->marked_sections(1);
@@ -1371,6 +1401,7 @@ sub end_part {
     my $result;
     if (!$Apache::lonxml::metamode) {
 	$result = &Apache::lonxml::endredirection(); # started in &start_part
+	$Apache::lonxml::post_evaluate=0;
     }
     if ($target eq 'grade') {
 	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
@@ -1403,7 +1434,8 @@ 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') {
+    if ($target eq 'web' || $target eq 'grade'    || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'webgrade') {
 	&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
 	if (!$Apache::lonhomework::scantronmode &&
 	    $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
@@ -1421,7 +1453,7 @@ sub end_preduedate {
 
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {
 	if ($Apache::lonhomework::scantronmode ||
 	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
@@ -1439,7 +1471,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 'tex' || $target eq 'webgrade') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	&Apache::lonxml::debug("not solved has :$gradestatus:");
 	if ($gradestatus =~ /^correct/ &&
@@ -1475,8 +1507,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') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
 	if (!defined($mode)) { $mode='show'; }
 	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
@@ -1584,7 +1616,7 @@ sub start_simpleeditbutton {
     my $result='';
     if (($env{'form.simple_edit_button'} ne 'off') &&
 	($target eq 'web') &&
-        (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
 	my ($symb) = &Apache::lonxml::whichuser();