--- loncom/homework/optionresponse.pm	2004/12/04 00:41:26	1.122
+++ loncom/homework/optionresponse.pm	2005/06/22 12:03:23	1.129
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.122 2004/12/04 00:41:26 albertel Exp $
+# $Id: optionresponse.pm,v 1.129 2005/06/22 12:03:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@ package Apache::optionresponse;
 use strict;
 use Apache::response();
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
@@ -121,14 +122,14 @@ ENDTABLE
     my @options;
     my $optchanged=0;
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
-    if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
-      my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+    if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+      my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");
       splice(@options,$delopt-1,1);
       $optchanged=1;
     }
-    if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
-      my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+    if ($env{"form.$Apache::lonxml::curdepth.options"}) {
+      my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
       if ($options[0]) {
 	push(@options,$newopt);
       } else {
@@ -164,6 +165,8 @@ sub end_foilgroup {
     my $name;
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    &Apache::lonxml::debug("options:".join(':',@opt));
+
     my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
 					     -2,0);
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
@@ -182,7 +185,7 @@ sub end_foilgroup {
 	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {
-      if ( defined $ENV{'form.submitted'}) {
+      if ( &Apache::response::submitted()) {
 	my @whichopt = &whichfoils($max,$randomize);
 	my $temp=1;my $name;
 	my %responsehash;
@@ -192,7 +195,7 @@ sub end_foilgroup {
 	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response=&Apache::response::getresponse($temp);
-	  if ($ENV{'form.submitted'} eq 'scantron' && $response=~/\S/) {
+	  if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
 	      $response = $opt[$response];
 	  }
 	  if ( $response =~ /[^\s]/) {
@@ -357,7 +360,7 @@ sub displayfoils {
 		if ($text=~/^\s*$/) {
 		    $text=$value.$text;
 		} else {
-		    $text=$value.': '.$text;
+		    $text='<b>'.$value.':</b> '.$text;
 		}
 	    } else {
 		$text='&#149;'.$text;
@@ -384,13 +387,13 @@ sub displayfoils {
       }
       my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";
-      my $option;
-      foreach $option (@opt) {
-	if ($option eq $lastopt) {
-	  $optionlist.="<option selected=\"on\">$option</option>\n";
-	} else {
-	  $optionlist.="<option>$option</option>\n";
-	}
+      foreach my $option (@opt) {
+	  my $escopt=&HTML::Entities::encode($option,'\'"&<>');
+	  if ($option eq $lastopt) {
+	      $optionlist.="<option value='".$escopt."' selected=\"on\">$option</option>\n";
+	  } else {
+	      $optionlist.="<option value='".$escopt."'>$option</option>\n";
+	  }
       }
       if ($target ne 'tex') {
 	  if ($Apache::lonhomework::type ne 'exam') {
@@ -511,11 +514,11 @@ sub bubbles {
     my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;
     my $textwidth;
-    if ($ENV{'form.textwidth'} ne '') {
-	$ENV{'form.textwidth'}=~/(\d+)/;
+    if ($env{'form.textwidth'} ne '') {
+	$env{'form.textwidth'}=~/(\d+)/;
 	$textwidth=$1;
     } else {
-	$ENV{'textwidth'}=~/(\d*)\.?(\d*)/;
+	$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
 	$textwidth=$1.'.'.$2;
     }
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
@@ -629,7 +632,10 @@ sub end_foil {
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       &Apache::lonxml::debug("Got a name of :$name:");
-      if (!$name) { $name=$Apache::lonxml::curdepth; }
+      if ($name eq "") {
+	  &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+	  $name=$Apache::lonxml::curdepth;
+      }
       &Apache::lonxml::debug("Using a name of :$name:");
       if (defined($Apache::response::foilnames{$name})) {
 	  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));