--- loncom/interface/loncommon.pm	2006/03/23 23:43:13	1.320
+++ loncom/interface/loncommon.pm	2006/03/29 19:39:55	1.324
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.320 2006/03/23 23:43:13 albertel Exp $
+# $Id: loncommon.pm,v 1.324 2006/03/29 19:39:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2801,7 +2801,8 @@ form, .inline { display: inline; }
 style="margin-top: 0px;$addstyle" $addentries>
 END
     &Apache::lontexconvert::jsMath_reset();
-    if ($env{'environment.texengine'} eq 'jsMath') {
+    if ($env{'environment.texengine'} eq 'jsMath' ||
+	$env{'form.texengine'}        eq 'jsMath' ) {
 	$bodytag.=&Apache::lontexconvert::jsMath_header();
     }
 
@@ -3006,7 +3007,7 @@ sub headtag {
 	$env{'internal.head.redirect'} = $url;
 	$result.=<<ADDMETA
 <meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$url" />
+<meta HTTP-EQUIV="Refresh" CONTENT="$time; url=$url" />
 ADDMETA
     }
     if (!defined($title)) {
@@ -3014,7 +3015,6 @@ ADDMETA
     }
     
     $result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra;
-    
     return $result;
 }
 
@@ -3093,7 +3093,7 @@ sub start_page {
     my %head_args;
     foreach my $arg ('redirect','force_register') {
 	if (defined($args->{$arg})) {
-	    $head_args{$arg} = $args->{$args};
+	    $head_args{$arg} = $args->{$arg};
 	}
     }
 
@@ -3149,15 +3149,17 @@ sub end_page {
 sub html_encode {
     my ($result) = @_;
 
-    $result = &HTML::Entities::encode($result,'"');
+    $result = &HTML::Entities::encode($result,'<>&"');
     
     return $result;
 }
 sub js_ready {
     my ($result) = @_;
 
-    $result =~ s/[\n\r]/ /g;
-    $result =~ s/'/\\'/g;	
+    $result =~ s/[\n\r]/ /xmsg;
+    $result =~ s/\\/\\\\/xmsg;
+    $result =~ s/'/\\'/xmsg;
+    $result =~ s{</script>}{</scrip'+'t>}xmsg;
     
     return $result;
 }