--- loncom/xml/scripttag.pm 2003/06/08 00:43:19 1.93
+++ loncom/xml/scripttag.pm 2003/10/30 20:20:00 1.102
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Script Vars
";
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -156,6 +177,7 @@ sub start_display {
$target eq 'analyze') {
$result=''; # grade should produce no output
}
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq "edit" ) {
#$result =
# "
<$token->[1]> output:
$bodytext
Source:
";
@@ -282,15 +304,16 @@ 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='*'; }
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/\"/\"\;/g;
- $result = "newwindow $output