--- loncom/interface/lonhelp.pm 2003/02/25 22:50:11 1.5 +++ loncom/interface/lonhelp.pm 2005/07/12 15:53:48 1.19 @@ -35,6 +35,9 @@ use Apache::File(); use Apache::loncommon(); use Apache::lonacc(); use Apache::lontexconvert(); +use Apache::lonnavmaps; # for advancedUser +use Apache::lonlocal; +use Apache::lonnet; use tth(); use GDBM_File(); @@ -51,28 +54,38 @@ 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 $r->print($tex); + if (&Apache::lonnavmaps::advancedUser()) { $r->print(<
-
About - LON-CAPA help and More Help
+
$footer
+ + +FOOTER + } else { + $r->print(< FOOTER + } } # Render takes a tex fragment, transforms it for TtH, and returns the @@ -90,7 +103,11 @@ sub render # LaTeX .aux files # absolute paths for use with help.loncapa.org $tex =~ s| \\ref\{([^}]*)\} - |'\\begin{html}' . @@ -107,7 +124,7 @@ sub render |gxe; - $tex=&Apache::lontexconvert::converted(\$tex); + $tex=&Apache::lontexconvert::tth_converted(\$tex); # Finish backslashes $tex =~ s/###BACKSLASH###/'\\'/ge; @@ -132,40 +149,57 @@ sub handler my $docroot = $r->dir_config('lonDocRoot'); my $serverroot = $ENV{'HTTP_HOST'}; - my $filename = 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 # will be "not found", no matter what. - return HTTP_NOT_FOUND if ($filename !~ /\A[-0-9a-zA-z_'',.]+\Z/); + return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/); - (my $file = Apache::File->new($docroot . "/adm/help/tex/".$filename.'.tex')) - or return HTTP_NOT_FOUND; + &Apache::lonlocal::get_language_handle($r); - # get me my environment if it exists - &Apache::lonacc::handler($r); + # Join together the tex files, return HTTP_NOT_FOUND if any of + # them are not found + my $tex = ''; + # Since in insertlist.tab I want to specify multiple files, + # and insertlist.tab also uses commas, I need something else + # so replace : with , + $filenames =~ s/:/,/g; + my @files = split(/,/, $filenames); + + for my $filename (@files) { + if (-e $docroot.'/adm/help/tex/'. + &Apache::lonlocal::current_language().'/'. + $filename.'.tex') { + $filename=&Apache::lonlocal::current_language().'/'.$filename; + } + (my $file = Apache::File->new($docroot + . '/adm/help/tex/'.$filename.'.tex')) + or return HTTP_NOT_FOUND; + $tex .= join('', <$file>); + } - if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + 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'); } } else { - $r->content_type("text/html"); + &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'); } } - my $tex = join('', <$file>); + $r->send_http_header; $tex = render($tex, $docroot, $serverroot); serveTex($tex, $r);