[BACK]Return to lonhelp.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelp.pm between versions 1.10 and 1.14

version 1.10, 2003/09/22 04:14:04 version 1.14, 2004/01/15 03:18:19
Line 36  use Apache::loncommon(); Line 36  use Apache::loncommon();
 use Apache::lonacc();  use Apache::lonacc();
 use Apache::lontexconvert();  use Apache::lontexconvert();
 use Apache::lonnavmaps; # for advancedUser  use Apache::lonnavmaps; # for advancedUser
   use Apache::lonlocal;
 use tth();  use tth();
 use GDBM_File();  use GDBM_File();
   
Line 52  sub processLabelName Line 53  sub processLabelName
 sub serveTex  sub serveTex
 {  {
     my ($tex, $r) = @_;      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(<<HEADER);  $r->print(<<HEADER);
 <html>  <html>
     <head>      <head>
Line 60  $r->print(<<HEADER); Line 63  $r->print(<<HEADER);
     </head>      </head>
     <body bgcolor="#FFFFFF">      <body bgcolor="#FFFFFF">
     <h3 style="font: sans-serif"><img align="right"      <h3 style="font: sans-serif"><img align="right"
     src="/adm/help/gif/lonhelpheader.gif"/>LON-CAPA Help<hr /></h3>      src="/adm/help/gif/lonhelpheader.gif"/>$header<hr />$bugs</h3>
     <!-- BEGIN -->      <!-- BEGIN -->
 HEADER  HEADER
   
Line 70  HEADER Line 73  HEADER
 $r->print(<<FOOTER);  $r->print(<<FOOTER);
     <!-- END -->      <!-- END -->
     <hr />      <hr />
     <center><font size="-1"><a href="/adm/help/abouthelp.html">About      <center><font size="-1"><a href="/adm/help/abouthelp.html">$footer</a></font></center>
     LON-CAPA help and More Help</a></font></center>  
     </body>      </body>
 </html>  </html>
 FOOTER  FOOTER
Line 141  sub handler Line 143  sub handler
      my $docroot = $r->dir_config('lonDocRoot');       my $docroot = $r->dir_config('lonDocRoot');
      my $serverroot = $ENV{'HTTP_HOST'};       my $serverroot = $ENV{'HTTP_HOST'};
   
      my $filenames = substr ($ENV{'REQUEST_URI'} ,        my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , 
     rindex($ENV{'REQUEST_URI'}, '/') + 1, -4);      rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
             
      # Security check on the file; the whole filename must consist       # Security check on the file; the whole filename must consist
      # of nothing but alphanums, ' ,, or ., or the file       # of nothing but alphanums, ' ,, or ., or the file
Line 162  sub handler Line 164  sub handler
      my @files = split(/,/, $filenames);       my @files = split(/,/, $filenames);
             
      for my $filename (@files) {       for my $filename (@files) {
  if (-e $docroot.'/adm/help/tex/'.$filename.'_'.   if (-e $docroot.'/adm/help/tex/'.
      &Apache::lonlocal::current_language().'.tex') {       &Apache::lonlocal::current_language().'/'.
      $filename.='_'.&Apache::lonlocal::current_language();       $filename.'.tex') {
        $filename=&Apache::lonlocal::current_language().'/'.$filename;
  }   }
  (my $file = Apache::File->new($docroot   (my $file = Apache::File->new($docroot
    . '/adm/help/tex/'.$filename.'.tex'))     . '/adm/help/tex/'.$filename.'.tex'))
Line 172  sub handler Line 175  sub handler
  $tex .= join('', <$file>);   $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');   &Apache::loncommon::content_type($r,'text/xml');
  &tth::ttminit();   &tth::ttminit();
Line 193  sub handler Line 193  sub handler
  }   }
      }       }
   
        $r->send_http_header;
      $tex = render($tex, $docroot, $serverroot);       $tex = render($tex, $docroot, $serverroot);
      serveTex($tex, $r);       serveTex($tex, $r);
   
Removed from v.1.10  
changed lines
  Added in v.1.14

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>