--- loncom/interface/lonhelp.pm 2003/09/22 18:35:46 1.11 +++ loncom/interface/lonhelp.pm 2005/04/07 06:56:23 1.18 @@ -37,6 +37,7 @@ use Apache::lonacc(); use Apache::lontexconvert(); use Apache::lonnavmaps; # for advancedUser use Apache::lonlocal; +use Apache::lonnet; use tth(); use GDBM_File(); @@ -53,15 +54,18 @@ sub processLabelName sub serveTex { my ($tex, $r) = @_; - -$r->print(< + my $html=&Apache::lonxml::xmlbegin(); + my $bugs=&Apache::loncommon::help_open_bug('Documentation'); + my $header=&mt('LON-CAPA Help'); + my $footer=&mt('About LON-CAPA help and More Help'); + $r->print(< LON-CAPA Help

LON-CAPA Help

+ src="/adm/help/gif/lonhelpheader.gif"/>$header
$bugs HEADER @@ -71,8 +75,7 @@ HEADER $r->print(<
-
About - LON-CAPA help and More Help
+
$footer
FOOTER @@ -100,7 +103,11 @@ sub render # LaTeX .aux files # absolute paths for use with help.loncapa.org $tex =~ s| \\ref\{([^}]*)\} - |'\\begin{html}' . @@ -117,7 +124,7 @@ sub render |gxe; - $tex=&Apache::lontexconvert::converted(\$tex); + $tex=&Apache::lontexconvert::tth_converted(\$tex); # Finish backslashes $tex =~ s/###BACKSLASH###/'\\'/ge; @@ -142,8 +149,8 @@ sub handler my $docroot = $r->dir_config('lonDocRoot'); my $serverroot = $ENV{'HTTP_HOST'}; - my $filenames = substr ($ENV{'REQUEST_URI'} , - rindex($ENV{'REQUEST_URI'}, '/') + 1, -4); + my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , + rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); # Security check on the file; the whole filename must consist # of nothing but alphanums, ' ,, or ., or the file @@ -174,13 +181,10 @@ sub handler $tex .= join('', <$file>); } - # get me my environment if it exists - &Apache::lonacc::handler($r); - - if ($ENV{'browser.mathml'}) { + if ($env{'browser.mathml'}) { &Apache::loncommon::content_type($r,'text/xml'); &tth::ttminit(); - if ($ENV{'browser.unicode'}) { + if ($env{'browser.unicode'}) { &tth::ttmoptions('-L -u1'); } else { &tth::ttmoptions('-L -u0'); @@ -188,13 +192,14 @@ sub handler } else { &Apache::loncommon::content_type($r,"text/html"); &tth::tthinit(); - if ($ENV{'browser.unicode'}) { + if ($env{'browser.unicode'}) { &tth::tthoptions('-L -u1'); } else { &tth::tthoptions('-L -u0'); } } + $r->send_http_header; $tex = render($tex, $docroot, $serverroot); serveTex($tex, $r);