* Forgot to catch an 'if' so I could get proper indentation

[squirrelmail.git] / src / help.php

diff --git a/src/help.php b/src/help.php
index 884b8fdda06e0ad013ff1b4e433be6cace883dc0..93fa7a35137152aac5af3ce693aab3ed8ac5133e 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -7,14 +7,15 @@
     **
     **  Displays help for the user
     **
+    **  $Id$
     **/
 
    session_start();
 
-   if (!isset($config_php))
-      include("../config/config.php");
    if (!isset($strings_php))
       include("../functions/strings.php");
+   if (!isset($config_php))
+      include("../config/config.php");
    if (!isset($page_header_php))
       include("../functions/page_header.php");
    if (!isset($display_messages_php))
@@ -56,17 +57,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 {
@@ -114,6 +117,9 @@
          $context = "search"; 
    }
    
+   if (!$squirrelmail_language)
+      $squirrelmail_language = "en";
+
    if (file_exists("../help/$squirrelmail_language")) {
       $help_exists = true;
       $user_language = $squirrelmail_language;
@@ -133,6 +139,8 @@
    }
    
    if ($help_exists) {
+      if (! isset($context))
+          $context = '';
       if ($context == "compose")
          $chapter = 4;
       else if ($context == "address")
@@ -148,7 +156,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");
@@ -167,19 +175,20 @@
 
          echo "<small><center>";
 
-         if ($chapter <= 1) echo "<font color=\"$color[9]\">Previous</font> | ";
-         else echo "<a href=\"../src/help.php?chapter=".($chapter-1)."\">Previous</a> | ";
-         echo "<a href=\"../src/help.php\">Table of Contents</a>";
-         if ($chapter >= count($helpdir)) echo " | <font color=\"$color[9]\">Next</font>";
-         else echo " | <a href=\"../src/help.php?chapter=".($chapter+1)."\">Next</a>\n";
+         if ($chapter <= 1) echo "<font color=\"$color[9]\">"._("Previous")."</font> | ";
+         else echo "<a href=\"../src/help.php?chapter=".($chapter-1)."\">"._("Previous")."</a> | ";
+         echo "<a href=\"../src/help.php\">"._("Table of Contents")."</a>";
+         if ($chapter >= count($helpdir)) echo " | <font color=\"$color[9]\">"._("Next")."</font>";
+         else echo " | <a href=\"../src/help.php?chapter=".($chapter+1)."\">"._("Next")."</a>\n";
          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   
             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);