--- loncom/homework/lonhomework.pm	2004/03/09 20:37:58	1.171
+++ loncom/homework/lonhomework.pm	2004/05/25 21:25:53	1.175
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.171 2004/03/09 20:37:58 albertel Exp $
+# $Id: lonhomework.pm,v 1.175 2004/05/25 21:25:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -207,11 +207,11 @@ sub check_access {
 		if ( ! ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
 			lc($Apache::lonhomework::problemstatus) eq 'no')) {
 		    return ('CANNOT_ANSWER',
-			    &mt('is in this state by royal decree.'));
+			    &mt('is in this state due to author settings.'));
 		}
 	    } else {
 		return ($ENV{'form.problemstate'},
-			&mt('is in this state by royal decree.'));
+			&mt('is in this state due to author settings.'));
 	    }
 	}
 	&Apache::lonxml::debug("in construction ignoring dates");
@@ -440,7 +440,6 @@ sub analyze_header {
             <hr />
             <input type="submit" name="submit" value="'.&mt("View").'" />
             <hr />
-            '.&mt('List of possible answers').':
             </form>';
     &Apache::lonxml::add_messages(\$result);
     $request->print($result);
@@ -465,7 +464,8 @@ sub analyze {
     my %prog_state=
 	&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'),
 					      &mt('Getting Problem Variants'),
-					      $ENV{'form.numtoanalyze'});
+					      $ENV{'form.numtoanalyze'},
+					      'inline',undef);
     for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
 	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
 						 &mt('last problem'));
@@ -490,6 +490,7 @@ sub analyze {
     }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
 					  &mt('Analyzing Results'));
+    $request->print('<hr />'.&mt('List of possible answers').': ');
     foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
@@ -564,7 +565,7 @@ sub editxmlmode {
             <hr />
             ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem).'</textarea>
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
             </form></body></html>';
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
@@ -753,7 +754,8 @@ sub handler {
     #check if we know where we are
     if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
 	# if we are browsing we might not be able to know where we are
-	if ($Apache::lonhomework::browse ne 'F') {
+	if ($Apache::lonhomework::browse ne 'F' && 
+	    $ENV{'request.state'} ne "construct") {
 	    #should know where we are, so ask
 	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 		&Apache::lonnet::cleanenv();