--- loncom/interface/lonhelp.pm	2006/04/03 02:04:55	1.25
+++ loncom/interface/lonhelp.pm	2006/05/30 12:46:09	1.27
@@ -1,4 +1,7 @@
 # The LearningOnline Network with CAPA
+#
+# $Id: lonhelp.pm,v 1.27 2006/05/30 12:46:09 www Exp $
+#
 # .tex help system web server handler
 #
 # Copyright Michigan State University Board of Trustees
@@ -24,8 +27,7 @@
 # http://www.lon-capa.org/
 #
 # .tex file help handler
-# YEAR=2002
-# 7/4 Jeremy Bowers
+
 
 package Apache::lonhelp;
 
@@ -40,6 +42,9 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use tth();
 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
 # that is a valid anchor name.
@@ -62,8 +67,8 @@ sub servetext {
     my $header=&mt('LON-CAPA Help');
     $r->print(<<HEADER);
     $start_page
-    <h3 style="font: sans-serif"><img align="right"
-    src="/adm/help/gif/lonhelpheader.gif"/>$header<hr />$bugs</h3>
+    <h3 style="font: sans-serif"><img align="right" alt="help logo"
+    src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr />$bugs
     <!-- BEGIN -->
 HEADER
 
@@ -73,9 +78,12 @@ HEADER
 	my $search=&mt('Search LON-CAPA help');
 	my $about=&mt('About LON-CAPA help and More Help');
         my $query=&mt('Search');
+	my $uri = $r->uri;
 	$r->print(<<FOOTER);
-    <hr /><form method="post">
-$search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" /><br />
+    <hr /><form action="$uri" method="post">
+$search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" />
+</form>
+<br />
 <a href="/adm/help/abouthelp.html">$about</a>
 FOOTER
  
@@ -196,7 +204,7 @@ sub handler {
              $text=&listmatches($docroot,$env{'form.searchterm'}); 
          }
      } else {
-	 my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , 
+	 my $filenames = &unescape(substr ($ENV{'REQUEST_URI'} , 
 							   rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
 	 
 	 # Security check on the file; the whole filename must consist