Import CUPS 1.4svn r7023 into easysw/current.

[thirdparty/cups.git] / cgi-bin / help.c

diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index 38fcec918c79fb568c9f63318ae19d16bf12ffd3..823f88f1257868061b50c77ac93509f3347de091 100644 (file)
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -1,7 +1,7 @@
 /*
  * "$Id$"
  *
- *   On-line help CGI for the Common UNIX Printing System (CUPS).
+ *   Online help CGI for the Common UNIX Printing System (CUPS).
  *
  *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
@@ -86,7 +86,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   {
     perror(filename);
 
-    cgiStartHTML(cgiText(_("Help")));
+    cgiStartHTML(cgiText(_("Online Help")));
     cgiSetVariable("ERROR", "Unable to load help index!");
     cgiCopyTemplateLang("error.tmpl");
     cgiEndHTML();
@@ -127,7 +127,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
     {
       perror(filename);
 
-      cgiStartHTML(cgiText(_("Help")));
+      cgiStartHTML(cgiText(_("Online Help")));
       cgiSetVariable("ERROR", "Unable to access help file!");
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -137,7 +137,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
     if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
     {
-      cgiStartHTML(cgiText(_("Help")));
+      cgiStartHTML(cgiText(_("Online Help")));
       cgiSetVariable("ERROR", "Help file not in index!");
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
@@ -168,13 +168,16 @@ main(int  argc,                           /* I - Number of command-line arguments */
     * Send a standard page header...
     */
 
-    cgiStartHTML(cgiText(_("Help")));
+    cgiStartHTML(cgiText(_("Online Help")));
   }
 
  /*
   * Do a search as needed...
   */
 
+  if (cgiGetVariable("CLEAR"))
+    cgiSetVariable("QUERY", "");
+
   query = cgiGetVariable("QUERY");
   topic = cgiGetVariable("TOPIC");
   si    = helpSearchIndex(hi, query, topic, helpfile);