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

Diff for /loncom/interface/lonhelp.pm between versions 1.25 and 1.28

version 1.25, 2006/04/03 02:04:55 version 1.28, 2006/06/26 22:22:00
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
   #
   # $Id$
   #
 # .tex help system web server handler  # .tex help system web server handler
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
Line 24 Line 27
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # .tex file help handler  # .tex file help handler
 # YEAR=2002  
 # 7/4 Jeremy Bowers  
   
 package Apache::lonhelp;  package Apache::lonhelp;
   
Line 40  use Apache::lonlocal; Line 42  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use tth();  use tth();
 use GDBM_File();  use GDBM_File();
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 # 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.
Line 62  sub servetext { Line 67  sub servetext {
     my $header=&mt('LON-CAPA Help');      my $header=&mt('LON-CAPA Help');
     $r->print(<<HEADER);      $r->print(<<HEADER);
     $start_page      $start_page
     <h3 style="font: sans-serif"><img align="right"      <h3 style="font: sans-serif"><img align="right" alt="help logo"
     src="/adm/help/gif/lonhelpheader.gif"/>$header<hr />$bugs</h3>      src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr />$bugs
     <!-- BEGIN -->      <!-- BEGIN -->
 HEADER  HEADER
   
Line 73  HEADER Line 78  HEADER
  my $search=&mt('Search LON-CAPA help');   my $search=&mt('Search LON-CAPA help');
  my $about=&mt('About LON-CAPA help and More Help');   my $about=&mt('About LON-CAPA help and More Help');
         my $query=&mt('Search');          my $query=&mt('Search');
    my $uri = $r->uri;
  $r->print(<<FOOTER);   $r->print(<<FOOTER);
     <hr /><form method="post">      <hr /><form action="$uri" method="post">
 $search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" /><br />  $search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" />
   </form>
   <br />
 <a href="/adm/help/abouthelp.html">$about</a>  <a href="/adm/help/abouthelp.html">$about</a>
 FOOTER  FOOTER
     
Line 183  sub handler { Line 191  sub handler {
      my $serverroot = $ENV{'HTTP_HOST'};       my $serverroot = $ENV{'HTTP_HOST'};
   
      &Apache::lonlocal::get_language_handle($r);       &Apache::lonlocal::get_language_handle($r);
        &Apache::loncommon::content_type($r,"text/html");
      my $text='';       my $text='';
      if ($env{'form.searchterm'}=~/\w/) {       if ($env{'form.searchterm'}=~/\w/) {
  &Apache::loncommon::content_type($r,"text/html");  
  ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');   ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');
          if ($matches) {           if ($matches) {
              my ($englishresult,$englishmatches)=&listmatches($docroot,$env{'form.searchterm'});               my ($englishresult,$englishmatches)=&listmatches($docroot,$env{'form.searchterm'});
Line 196  sub handler { Line 204  sub handler {
              $text=&listmatches($docroot,$env{'form.searchterm'});                $text=&listmatches($docroot,$env{'form.searchterm'}); 
          }           }
      } else {       } else {
  my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} ,    my $filenames = &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
Line 225  sub handler { Line 233  sub handler {
          or return HTTP_NOT_FOUND;           or return HTTP_NOT_FOUND;
      $tex .= join('', <$file>);       $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);   $text = &render($tex, $docroot, $serverroot);
      }       }
   
Removed from v.1.25  
changed lines
  Added in v.1.28

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