--- loncom/interface/lonhelp.pm 2003/02/25 22:50:11 1.5 +++ loncom/interface/lonhelp.pm 2004/01/15 03:18:19 1.14 @@ -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(); @@ -51,7 +53,9 @@ sub processLabelName sub serveTex { my ($tex, $r) = @_; - + 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(< @@ -59,21 +63,28 @@ $r->print(<

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 # HTML equivalent @@ -132,23 +143,40 @@ 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'); + &Apache::loncommon::content_type($r,'text/xml'); &tth::ttminit(); if ($ENV{'browser.unicode'}) { &tth::ttmoptions('-L -u1'); @@ -156,7 +184,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'); @@ -165,7 +193,7 @@ sub handler } } - my $tex = join('', <$file>); + $r->send_http_header; $tex = render($tex, $docroot, $serverroot); serveTex($tex, $r);