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

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

version 1.14, 2004/01/15 03:18:19 version 1.21, 2006/03/15 23:41:49
Line 37  use Apache::lonacc(); Line 37  use Apache::lonacc();
 use Apache::lontexconvert();  use Apache::lontexconvert();
 use Apache::lonnavmaps; # for advancedUser  use Apache::lonnavmaps; # for advancedUser
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
 use tth();  use tth();
 use GDBM_File();  use GDBM_File();
   
 # This sub takes the name of a label in, and converts it to something  # This sub takes the name of a label in, and converts it to something
 # that is a valid anchor name.  # that is a valid anchor name.
 sub processLabelName   
 {  sub processLabelName {
     my ($name) = @_;      my ($name) = @_;
     $name =~ tr/a-zA-Z0-9/_/cs;      $name =~ tr/a-zA-Z0-9/_/cs;
     return $name;      return $name;
 }  }
   
 # Serve out the Tex  # Serve out the text
 sub serveTex  sub servetext {
 {      my ($r,$text) = @_;
     my ($tex, $r) = @_;      my $html=&Apache::lonxml::xmlbegin();
       my $htmlend=&Apache::lonxml::xmlend();
     my $bugs=&Apache::loncommon::help_open_bug('Documentation');      my $bugs=&Apache::loncommon::help_open_bug('Documentation');
     my $header=&mt('LON-CAPA Help');      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>
         <title>LON-CAPA Help</title>          <title>LON-CAPA Help</title>
     </head>      </head>
Line 67  $r->print(<<HEADER); Line 68  $r->print(<<HEADER);
     <!-- BEGIN -->      <!-- BEGIN -->
 HEADER  HEADER
   
     $r->print($tex);      $r->print($text);
   
     if (Apache::lonnavmaps::advancedUser()) {      if (&Apache::lonnavmaps::advancedUser()) {
 $r->print(<<FOOTER);   my $search=&mt('Search LON-CAPA help');
    my $about=&mt('About LON-CAPA help and More Help');
    $r->print(<<FOOTER);
     <!-- END -->      <!-- END -->
     <hr />      <hr /><form method="post">
     <center><font size="-1"><a href="/adm/help/abouthelp.html">$footer</a></font></center>  $search: <input type="text" name="searchterm" size="40" /><br />
   <a href="/adm/help/abouthelp.html">$about</a>
     </body>      </body>
 </html>  $htmlend
 FOOTER  FOOTER
 } else {      }
     $r->print(<<FOOTER);      $r->print(<<ENDBODY);
     <!-- END -->      <!-- END -->
     </body>      </body>
 </html>  $htmlend
 FOOTER  ENDBODY
 }  
 }  }
   
 # Render takes a tex fragment, transforms it for TtH, and returns the  # Render takes a tex fragment, transforms it for TtH, and returns the
 # HTML equivalent  # HTML equivalent
 sub render   sub render {
 {  
     my ($tex, $docroot, $serverroot) = @_;      my ($tex, $docroot, $serverroot) = @_;
     tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);      tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);
   
Line 101  sub render Line 103  sub render
     # LaTeX .aux files      # LaTeX .aux files
     # absolute paths for use with help.loncapa.org      # absolute paths for use with help.loncapa.org
     $tex =~ s|  \\ref\{([^}]*)\}      $tex =~ s|  \\ref\{([^}]*)\}
              |'\\begin{html}<a href="http://' . $serverroot ."/adm/help/".               |
                 if (not(exists($fragmentLabels{$1}))) {
             &Apache::lonnet::logthis("ERROR: $1 not a valid help label");
                 };
                '\\begin{html}<a href="http://' . $serverroot ."/adm/help/".
               substr($fragmentLabels{$1}, 0, -4) .                substr($fragmentLabels{$1}, 0, -4) .
               '.hlp#' . processLabelName($1) .                 '.hlp#' . &processLabelName($1) . 
              '"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' .               '"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' .
              '\\end{html}'               '\\end{html}'
              |gxe;               |gxe;
Line 118  sub render Line 124  sub render
              |gxe;               |gxe;
   
   
     $tex=&Apache::lontexconvert::converted(\$tex);      $tex=&Apache::lontexconvert::tth_converted(\$tex);
           
     # Finish backslashes      # Finish backslashes
     $tex =~ s/###BACKSLASH###/'\\'/ge;      $tex =~ s/###BACKSLASH###/'\\'/ge;
Line 136  sub render Line 142  sub render
     return $tex;      return $tex;
 }  }
   
 sub handler  sub handler {
 {  
      my $r = shift;       my $r = shift;
   
      my $docroot = $r->dir_config('lonDocRoot');       my $docroot = $r->dir_config('lonDocRoot');
      my $serverroot = $ENV{'HTTP_HOST'};       my $serverroot = $ENV{'HTTP_HOST'};
   
      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 ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/);  
   
      &Apache::lonlocal::get_language_handle($r);       &Apache::lonlocal::get_language_handle($r);
        my $text='';
        if ($env{'form.searchterm'}=~/\w/) {
        } else {
           my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , 
       rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
   
      # Join together the tex files, return HTTP_NOT_FOUND if any of          # Security check on the file; the whole filename must consist
      # them are not found          # of nothing but alphanums, ' ,, or ., or the file
      my $tex = '';          # will be "not found", no matter what.
      # 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) {          return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/);
  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'}) {          # Join together the tex files, return HTTP_NOT_FOUND if any of
  &Apache::loncommon::content_type($r,'text/xml');          # them are not found
  &tth::ttminit();          my $tex = '';
  if ($ENV{'browser.unicode'}) {          # Since in insertlist.tab I want to specify multiple files,
      &tth::ttmoptions('-L -u1');          # and insertlist.tab also uses commas, I need something else
  } else {          # so replace : with ,
      &tth::ttmoptions('-L -u0');          $filenames =~ s/:/,/g;
  }          my @files = split(/,/, $filenames);
      } else {       
  &Apache::loncommon::content_type($r,"text/html");          for my $filename (@files) {
  &tth::tthinit();      if (-e $docroot.'/adm/help/tex/'.
  if ($ENV{'browser.unicode'}) {          &Apache::lonlocal::current_language().'/'.
      &tth::tthoptions('-L -u1');          $filename.'.tex') {
  } else {          $filename=&Apache::lonlocal::current_language().'/'.$filename;
      &tth::tthoptions('-L -u0');      }
  }      (my $file = Apache::File->new($docroot
        . '/adm/help/tex/'.$filename.'.tex'))
            or return HTTP_NOT_FOUND;
        $tex .= join('', <$file>);
           }
   
           if ($env{'browser.mathml'}) {
      &Apache::loncommon::content_type($r,'text/xml');
      &tth::ttminit();
      if ($env{'browser.unicode'}) {
          &tth::ttmoptions('-L -u1');
      } else {
          &tth::ttmoptions('-L -u0');
      }
           } else {
      &Apache::loncommon::content_type($r,"text/html");
      &tth::tthinit();
      if ($env{'browser.unicode'}) {
          &tth::tthoptions('-L -u1');
      } else {
          &tth::tthoptions('-L -u0');
      }
           }
           $text = &render($tex, $docroot, $serverroot);
      }       }
   
      $r->send_http_header;       $r->send_http_header;
      $tex = render($tex, $docroot, $serverroot);       &servetext($r,$text);
      serveTex($tex, $r);  
   
      return OK;       return OK;
 }  }
   
Removed from v.1.14  
changed lines
  Added in v.1.21

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