Putting Erin and Philippe as retired, and getting STABLE and DEVEL in sync.

[squirrelmail.git] / src / help.php

diff --git a/src/help.php b/src/help.php
index 4f75306fc1a4b1399ff72a055decba34164f8014..2c0798c7d9cd671e8d5912ef17698e5b1b5adc42 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -116,9 +116,10 @@ if (file_exists("../help/$squirrelmail_language")) {
     $user_language = 'en_US';
 } else {
     error_box( _("Help is not available. Please contact your system administrator for assistance."));
-    // display footer (closes html tags) and stop script execution
+    echo '</td></tr></table>';
+    // Display footer (closes HTML tags) and stop script execution.
     $oTemplate->display('footer.tpl');
-    exit();
+    exit;
 }
 
 
@@ -176,6 +177,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
     echo html_tag( 'ol' );
 
     // Write the TOC chapters.
+    // FIXME: HTML code is not compliant.
     for ($i=0, $cnt = count($toc); $i < $cnt; $i++) {
         echo '<li><a href="../src/help.php?chapter=' . $toc[$i][0]. '">' .
             $toc[$i][1] . '</a>' . html_tag( 'ul', $toc[$i][2] );
@@ -197,7 +199,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
     } elseif (file_exists("../help/en_US/" . $helpdir[$chapter-1])) {
         // If the selected language can't be found, try English.
         $doc = file("../help/en_US/" . $helpdir[$chapter-1]);
-        error_box(_("This chapter in not available in the selected language. It will be displayed in English instead."));
+        error_box(_("This chapter is not available in the selected language. It will be displayed in English instead."));
         echo '<br />';
     } else {
         // If English can't be found, the chapter went MIA.
@@ -240,7 +242,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
             $section++;
             $help_info = get_info($doc, $n);
             echo "<b>$chapter.$section - $help_info[0]</b>" .
-                html_tag( 'ul', $help_info[1] );
+                $help_info[1];
             $n = $help_info[3];
         }