--- loncom/interface/lonhelp.pm 2003/07/15 18:50:43 1.6 +++ loncom/interface/lonhelp.pm 2003/09/22 18:35:46 1.11 @@ -35,6 +35,8 @@ use Apache::File(); use Apache::loncommon(); use Apache::lonacc(); use Apache::lontexconvert(); +use Apache::lonnavmaps; # for advancedUser +use Apache::lonlocal; use tth(); use GDBM_File(); @@ -65,6 +67,7 @@ HEADER $r->print($tex); + if (Apache::lonnavmaps::advancedUser()) { $r->print(<
@@ -73,6 +76,13 @@ $r->print(< FOOTER +} else { + $r->print(< + + +FOOTER +} } # Render takes a tex fragment, transforms it for TtH, and returns the @@ -139,14 +149,25 @@ sub handler # of nothing but alphanums, ' ,, or ., or the file # will be "not found", no matter what. - return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',.]+\Z/); + return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/); + + &Apache::lonlocal::get_language_handle($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; @@ -157,7 +178,7 @@ sub handler &Apache::lonacc::handler($r); if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); &tth::ttminit(); if ($ENV{'browser.unicode'}) { &tth::ttmoptions('-L -u1'); @@ -165,7 +186,7 @@ sub handler &tth::ttmoptions('-L -u0'); } } else { - $r->content_type("text/html"); + &Apache::loncommon::content_type($r,"text/html"); &tth::tthinit(); if ($ENV{'browser.unicode'}) { &tth::tthoptions('-L -u1');