--- loncom/interface/loncommon.pm	2006/03/21 21:49:30	1.319
+++ loncom/interface/loncommon.pm	2006/04/06 20:52:58	1.326
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.319 2006/03/21 21:49:30 albertel Exp $
+# $Id: loncommon.pm,v 1.326 2006/04/06 20:52:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2737,7 +2737,9 @@ Inputs:
 =item * $forcereg, if page should register as content page (relevant for 
             text interface only)
 
-=item * $customtitle, overrides the $title in some way ????
+=item * $customtitle, alternate text to use instead of $title
+                      in the title box that appears, this text
+                      is not auto translated like the $title is
 
 =item * $notopbar, if true, keep the 'what is this' info but remove the
                    navigational links
@@ -2801,7 +2803,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 +3009,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 +3017,6 @@ ADDMETA
     }
     
     $result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra;
-    
     return $result;
 }
 
@@ -3051,8 +3053,8 @@ Inputs: $title - optional title for the
 =cut
 
 sub head {
-    my ($title,$head_extra) = @_;
-    return &headtag($title,$head_extra).&endheadtag();
+    my ($title,$head_extra,$args) = @_;
+    return &headtag($title,$head_extra,$args).&endheadtag();
 }
 
 =pod
@@ -3078,8 +3080,13 @@ Inputs: $title - optional title for the
                   bgcolor        -> override the default page bg color
                   js_ready       -> return a string ready for being used in 
                                     a javascript writeln
+                  html_encode    -> return a string ready for being used in 
+                                    a html attribute
                   force_register -> if is true will turn on the &bodytag()
                                     $forcereg arg
+                  body_title     -> alternate text to use instead of $title
+                                    in the title box that appears, this text
+                                    is not auto translated like the $title is
 
 =back
 
@@ -3091,7 +3098,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};
 	}
     }
 
@@ -3102,11 +3109,14 @@ sub start_page {
 	&bodytag($title, 
 		 $args->{'function'},       $args->{'add_entries'},
 		 $args->{'only_body'},      $args->{'domain'},
-		 $args->{'force_register'}, undef,
+		 $args->{'force_register'}, $args->{'body_title'},
 		 $args->{'no_nav_bar'},     $args->{'bgcolor'});
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
     }
+    if ($args->{'html_encode'}) {
+	$result = &html_encode($result);
+    }
     return $result;
 }
 
@@ -3121,6 +3131,8 @@ Returns a complete </body></html> sectio
 Inputs:         $args - additional optional args supported are:
                  js_ready     -> return a string ready for being used in 
                                  a javascript writeln
+                 html_encode  -> return a string ready for being used in 
+                                 a html attribute
 =back
 
 =cut
@@ -3133,15 +3145,26 @@ sub end_page {
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);
     }
+    if ($args->{'html_encode'}) {
+	$result = &html_encode($result);
+    }
     return $result;
 }
 
-sub js_ready {
+sub html_encode {
     my ($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;
 }