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

Diff for /loncom/interface/lonhelp.pm between versions 1.6 and 1.13

version 1.6, 2003/07/15 18:50:43 version 1.13, 2004/01/13 19:43:42
Line 35  use Apache::File(); Line 35  use Apache::File();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonacc();  use Apache::lonacc();
 use Apache::lontexconvert();  use Apache::lontexconvert();
   use Apache::lonnavmaps; # for advancedUser
   use Apache::lonlocal;
 use tth();  use tth();
 use GDBM_File();  use GDBM_File();
   
Line 65  HEADER Line 67  HEADER
   
     $r->print($tex);      $r->print($tex);
   
       if (Apache::lonnavmaps::advancedUser()) {
 $r->print(<<FOOTER);  $r->print(<<FOOTER);
     <!-- END -->      <!-- END -->
     <hr />      <hr />
Line 73  $r->print(<<FOOTER); Line 76  $r->print(<<FOOTER);
     </body>      </body>
 </html>  </html>
 FOOTER  FOOTER
   } else {
       $r->print(<<FOOTER);
       <!-- END -->
       </body>
   </html>
   FOOTER
   }
 }  }
   
 # Render takes a tex fragment, transforms it for TtH, and returns the  # Render takes a tex fragment, transforms it for TtH, and returns the
Line 132  sub handler Line 142  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
      # will be "not found", no matter what.       # 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       # Join together the tex files, return HTTP_NOT_FOUND if any of
      # them are not found       # them are not found
      my $tex = '';       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);       my @files = split(/,/, $filenames);
             
      for my $filename (@files) {       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   (my $file = Apache::File->new($docroot
    . '/adm/help/tex/'.$filename.'.tex'))     . '/adm/help/tex/'.$filename.'.tex'))
      or return HTTP_NOT_FOUND;       or return HTTP_NOT_FOUND;
  $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'}) {
  $r->content_type('text/xml');   &Apache::loncommon::content_type($r,'text/xml');
  &tth::ttminit();   &tth::ttminit();
  if ($ENV{'browser.unicode'}) {   if ($ENV{'browser.unicode'}) {
      &tth::ttmoptions('-L -u1');       &tth::ttmoptions('-L -u1');
Line 165  sub handler Line 183  sub handler
      &tth::ttmoptions('-L -u0');       &tth::ttmoptions('-L -u0');
  }   }
      } else {       } else {
  $r->content_type("text/html");   &Apache::loncommon::content_type($r,"text/html");
  &tth::tthinit();   &tth::tthinit();
  if ($ENV{'browser.unicode'}) {   if ($ENV{'browser.unicode'}) {
      &tth::tthoptions('-L -u1');       &tth::tthoptions('-L -u1');
Line 174  sub handler Line 192  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.6  
changed lines
  Added in v.1.13

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