--- loncom/homework/structuretags.pm	2006/05/30 12:45:37	1.356
+++ loncom/homework/structuretags.pm	2006/07/27 20:47:03	1.362
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.356 2006/05/30 12:45:37 www Exp $
+# $Id: structuretags.pm,v 1.362 2006/07/27 20:47:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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">';
 }
@@ -342,9 +342,11 @@ Feedback Mode:
 }
 
 sub initialize_storage {
+    my ($given_symb) = @_;
     undef(%Apache::lonhomework::results);
     undef(%Apache::lonhomework::history);
-    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    my ($symb,$courseid,$domain,$name) = 
+	&Apache::lonxml::whichuser($given_symb);
     
     # anonymous users (CODEd exams) have no data
     if ($name eq 'anonymous' 
@@ -384,11 +386,13 @@ sub initialize_storage {
 # Will increment totals for attempts, students, and corrects
 # if running user has student role.  
 sub finalize_storage {
+    my ($given_symb) = @_;
     my $result;
     if (%Apache::lonhomework::results) {
 	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
 	delete(@Apache::lonhomework::results{@remove});
-	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+	my ($symb,$courseid,$domain,$name) = 
+	    &Apache::lonxml::whichuser($given_symb);
 	if ($env{'request.state'} eq 'construct' 
 	    || $symb eq ''
 	    || $Apache::lonhomework::type eq 'practice') {
@@ -522,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 {
@@ -534,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 {
@@ -725,6 +735,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
@@ -1581,9 +1598,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') {