--- loncom/xml/scripttag.pm	2003/06/08 00:43:19	1.93
+++ loncom/xml/scripttag.pm	2003/06/09 21:37:54	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.93 2003/06/08 00:43:19 www Exp $
+# $Id: scripttag.pm,v 1.97 2003/06/09 21:37:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -282,14 +282,15 @@ sub end_window {
   my $result;
   if ($target eq 'web') {
     my $output=&Apache::lonxml::endredirection;
+    $output =~ s/[\n\r]/ /g;
+    $output = &HTML::Entities::encode($output,'<>&"\'');
+    $output =~ s/&/\\&/g;
     my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
     if (!$linktext) { $linktext='<sup>*</sup>'; }
     my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
-    $output =~ s/\'/\\\&\#39\;/g;
-    $output =~ s/\"/\&quot\;/g;
     $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=$width,height=$height,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;> $output </body></html>\');newWindow.document.close();void(0);\">$linktext</a>";
   } elsif ($target eq 'tex') {
       $result = '}';
