X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fhelp.php;h=dce8635229be4e68375cca12ec13069415423297;hp=09fcb1ad67e342574fcd2eb9416b3c13b9a46e81;hb=895905c0f766ea03e85deab260b4bb1522dd0e3c;hpb=245a6892bf5c780904ef9677f24d624ea17e0749

diff --git a/src/help.php b/src/help.php
index 09fcb1ad..dce86352 100644
--- a/src/help.php
+++ b/src/help.php
@@ -1,8 +1,9 @@
 <?php
+
    /**
     **  help.php
     **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
+    **  Copyright (c) 1999-2001 The SquirrelMail development team
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
     **
     **  Displays help for the user
@@ -10,41 +11,26 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($auth_php))
-      include ("../functions/auth.php"); 
-
-   include("../src/load_prefs.php");
-   displayPageHeader($color, "None");
-   is_logged_in(); 
-
-	$helpdir[0] = "basic.hlp";
-	$helpdir[1] = "main_folder.hlp";
-	$helpdir[2] = "read_mail.hlp";
-	$helpdir[3] = "compose.hlp";
-	$helpdir[4] = "addresses.hlp";
-	$helpdir[5] = "folders.hlp";
-	$helpdir[6] = "options.hlp";
-	$helpdir[7] = "search.hlp";
-	$helpdir[8] = "FAQ.hlp";
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+
+
+   displayPageHeader($color, 'None' );
+
+   $helpdir[0] = 'basic.hlp';
+   $helpdir[1] = 'main_folder.hlp';
+   $helpdir[2] = 'read_mail.hlp';
+   $helpdir[3] = 'compose.hlp';
+   $helpdir[4] = 'addresses.hlp';
+   $helpdir[5] = 'folders.hlp';
+   $helpdir[6] = 'options.hlp';
+   $helpdir[7] = 'search.hlp';
+   $helpdir[8] = 'FAQ.hlp';
 
    /****************[ HELP FUNCTIONS ]********************/
-   // parses through and gets the information from the different documents.  
+   // parses through and gets the information from the different documents.
    // this returns one section at a time.  You must keep track of the position
    // so that it knows where to start to look for the next section.
 
@@ -57,17 +43,19 @@
                   $ary[0] = trim($doc[$n]);
                }
                if (trim(strtolower($doc[$n])) == "<description>") {
+                  $ary[1] = "";
                   for ($n++;$n < count($doc) && (trim(strtolower($doc[$n])) != "</description>"); $n++) {
                      $ary[1] .= $doc[$n];
                   }
                }
                if (trim(strtolower($doc[$n])) == "<summary>") {
+                  $ary[2] = "";
                   for ($n++;$n < count($doc) && (trim(strtolower($doc[$n])) != "</summary>"); $n++) {
                      $ary[2] .= $doc[$n];
                   }
                }
-            }   
-            if ($ary) {
+            }
+            if (isset($ary)) {
                $ary[3] = $n;
                return $ary;
             } else {
@@ -75,14 +63,14 @@
                $ary[1] = "ERROR: Help files are not in the right format!";
                $ary[2] = "ERROR: Help files are not in the right format!";
                return $ary;
-            }   
+            }
          }
       }
       $ary[0] = "ERROR: Help files are not in the right format!";
       $ary[1] = "ERROR: Help files are not in the right format!";
       return $ary;
    }
-   
+
    /**************[ END HELP FUNCTIONS ]******************/
 
 ?>
@@ -100,21 +88,21 @@
    if ($HTTP_REFERER) {
       $ref = strtolower($HTTP_REFERER);
       if (strpos($ref, "src/compose"))
-         $context = "compose"; 
+         $context = "compose";
       else if (strpos($ref, "src/addr"))
-         $context = "address"; 
+         $context = "address";
       else if (strpos($ref, "src/folders"))
-         $context = "folders"; 
+         $context = "folders";
       else if (strpos($ref, "src/options"))
-         $context = "options"; 
+         $context = "options";
       else if (strpos($ref, "src/right_main"))
-         $context = "index"; 
+         $context = "index";
       else if (strpos($ref, "src/read_body"))
-         $context = "read"; 
+         $context = "read";
       else if (strpos($ref, "src/search"))
-         $context = "search"; 
+         $context = "search";
    }
-   
+
    if (!$squirrelmail_language)
       $squirrelmail_language = "en";
 
@@ -135,8 +123,10 @@
       echo "</td></tr></table>";
       exit;
    }
-   
+
    if ($help_exists) {
+      if (! isset($context))
+          $context = '';
       if ($context == "compose")
          $chapter = 4;
       else if ($context == "address")
@@ -152,7 +142,7 @@
       else if ($context == "search")
          $chapter = 8;
 
-      if (!$chapter) {
+      if (!isset($chapter)) {
          echo "<table cellpadding=0 cellspacing=0 border=0 align=center><tr><td>\n";
          echo "<b><center>" . _("Table of Contents") . "</center></b><br>";
          do_hook("help_chapter");
@@ -179,11 +169,12 @@
          echo "</center></small><br>\n";
 
          echo "<font size=5><b>$chapter - $help_info[0]</b></font><br><br>\n";
-         if ($help_info[1])
+         if (isset($help_info[1]))
             echo "$help_info[1]\n";
-         else   
+         else
             echo "<p>$help_info[2]</p>\n";
 
+         $section = 0;
          for ($n = $help_info[3]; $n < count($doc); $n++) {
             $section++;
             $help_info = get_info($doc, $n);
@@ -197,8 +188,8 @@
          echo "<br><center><a href=\"#pagetop\">" . _("Top") . "</a></center>\n";
       }
    }
-   do_hook("help_bottom"); 
+   do_hook("help_bottom");
 ?>
 <tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>
 <td></tr></table>
-</body></html>
+</body></html>
\ No newline at end of file