--- loncom/homework/structuretags.pm	2006/06/20 03:33:55	1.357
+++ loncom/homework/structuretags.pm	2006/08/28 14:26:04	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.357 2006/06/20 03:33:55 albertel Exp $
+# $Id: structuretags.pm,v 1.364 2006/08/28 14:26:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -134,7 +134,7 @@ sub page_start {
 	$body_args{'force_register'} = 1;
 	$body_args{'add_entries'}    = \%add_entries;	
     }
-
+    &Apache::lonlocal::mt_escape(\$name);
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
 
@@ -251,7 +251,7 @@ sub problem_edit_header {
        <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>'.
-       &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')
+       &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')
        .'</td></tr></table>'.
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }
@@ -526,7 +526,8 @@ sub init_problem_globals {
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
     undef($Apache::lonhomework::name);
-
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
 }
 
 sub reset_problem_globals {
@@ -538,6 +539,11 @@ sub reset_problem_globals {
 #detect if we try to do 2 problems in one file
 #   undef($Apache::lonhomework::parsing_a_problem);
     undef($Apache::lonhomework::name);
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
+    undef($Apache::lonhomework::scantronmode);
+    undef($Apache::lonhomework::problemstatus);
+    undef($Apache::lonhomework::ignore_response_errors);
 }
 
 sub set_problem_state {
@@ -587,7 +593,6 @@ sub start_problem {
 	$Apache::lonhomework::scantronmode=1;
     }
 
-    &initialize_storage();
     if ($target ne 'analyze') {
 	if ($target eq 'web') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
@@ -612,6 +617,8 @@ sub start_problem {
     }
     $Apache::lonhomework::default_type = $Apache::lonhomework::type;
 
+    &initialize_storage();
+
     #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
@@ -729,6 +736,13 @@ sub start_problem {
 							'problem');
 	    }
 	} elsif ($target eq 'web') {
+	    if ($status eq 'CAN_ANSWER' 
+		&& $slot_name ne ''
+		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
+		# unproctored slot access, self checkin
+		&Apache::bridgetask::check_in('problem',undef,undef,
+					      $slot_name);
+	    }
 	    $result.="\n $form_tag_start".	
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # create a page header and exit
@@ -1585,9 +1599,10 @@ sub end_startouttext {
 		 ."</td>
 <td>".
                  &Apache::edit::insertlist($target,$token).
+		 '</td><td align="right" valign="top">' .
+		 &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
-                 &Apache::edit::start_spanning_row()."\n"
-		 . &Apache::loncommon::helpLatexCheatsheet () .
+                 &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }
     if ($target eq 'modified') {