--- loncom/homework/structuretags.pm	2019/11/07 02:58:37	1.570
+++ loncom/homework/structuretags.pm	2023/04/02 03:16:28	1.574
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.570 2019/11/07 02:58:37 raeburn Exp $
+# $Id: structuretags.pm,v 1.574 2023/04/02 03:16:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,6 +63,7 @@ use Apache::londefdef;
 use Apache::lonenc();
 use Apache::loncommon();
 use Time::HiRes qw( gettimeofday tv_interval );
+use HTML::Entities();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
@@ -624,7 +625,9 @@ sub page_start {
         my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
         my ($path,$multiresp) = 
             &Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom);
-        if (($is_task) || ($needs_upload)) {
+        if ($env{'request.user_in_effect'}) {
+            $form_tag_start .= ' onsubmit="preventDefault();"';
+        } elsif (($is_task) || ($needs_upload)) {
             $form_tag_start .= ' onsubmit="return file_submission_check(this,'."'$path','$multiresp'".');"';
         }
 	$form_tag_start.='>'."\n";
@@ -1646,9 +1649,11 @@ sub firstaccess_msg {
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     my $buttontext = &mt('Show Resource');
     my $timertext = &mt('Start Timer?');
+    my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'\'"<>&');
     $result .= (<<ENDCHECKOUT);
 <form name="markaccess" method="post" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />
+<input type="hidden" name="symb" value="$shownsymb" />
 <input type="button" name="accessbutton" value="$buttontext" onclick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>
 ENDCHECKOUT
@@ -1842,6 +1847,11 @@ sub start_problem {
         }
     }
 
+    if (($target eq 'web') && ($env{'request.user_in_effect'})) {
+        &Apache::lonxml::get_all_text("/problem",$parser,$style);
+        return $result;
+    }
+
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
 
@@ -2126,6 +2136,12 @@ sub end_problem {
 	    }
 	}
 	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
+    } elsif ($target eq 'web') {
+        if ($env{'request.user_in_effect'}) {
+            &reset_problem_globals('problem');
+            $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+            return $result;
+        }
     }
 
     my $status=$Apache::inputtags::status['-1'];
@@ -3104,7 +3120,11 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result.=$gradestatus;
-	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {
+            if (not $env{'form.problem_split'}=~/yes/) {
+                $result.='\end{minipage}';
+            }
+        }
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
     } elsif ($target eq 'modified') {