X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fhelp.php;h=e9b3c3167ba6cf5034eb859f8e479c12f5b2be59;hb=dda2cc884dbb8745c36c973da3537aad45f4c264;hp=fd308540f7951156d0b154bd482b4b7f0cc60dae;hpb=e5916f84aece606bd90defd122c7f8f978166c6e;p=squirrelmail.git

diff --git a/src/help.php b/src/help.php
index fd308540..e9b3c316 100644
--- a/src/help.php
+++ b/src/help.php
@@ -11,10 +11,14 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
-require_once('../functions/array.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/array.php');
 
 displayPageHeader($color, 'None' );
 
@@ -82,23 +86,20 @@ function get_info($doc, $pos) {
 
 /**************[ END HELP FUNCTIONS ]******************/
 
-?>
 
-<br>
-<table width="95%" align="center" cellpadding="2" cellspacing="2" border="0">
- <tr>
-  <td bgcolor="<?php echo $color[0] ?>">
-   <center><b><?php echo _("Help") ?></b></center>
-  </td>
- </tr>
-</table>
-
-<?php do_hook("help_top") ?>
-
-<table width="90%" cellpadding="0" cellspacing="10" border="0" align="center">
-<tr>
-<td>
-<?php 
+
+echo html_tag( 'table',
+        html_tag( 'tr',
+            html_tag( 'td','<center><b>' . _("Help") .'</b></center>', 'center', $color[0] )
+        ) ,
+    'center', '', 'width="95%" cellpadding="1" cellspacing="2" border="0"' );
+
+do_hook("help_top");
+
+echo html_tag( 'table', '', 'center', '', 'width="90%" cellpadding="0" cellspacing="10" border="0"' ) .
+        html_tag( 'tr' ) .
+            html_tag( 'td' );
+
 if (isset($HTTP_REFERER)) {
     $ref = strtolower($HTTP_REFERER);
     if (strpos($ref, 'src/compose')){
@@ -133,10 +134,10 @@ if (file_exists("../help/$squirrelmail_language")) {
     $user_language = 'en_US';
 } else {
     $help_exists = false;
-    echo "<br><center><font color=\"$color[2]\">";
-    echo _("Some or all of the help documents are not present!");
-    echo '</font></center>';
-    echo '</td></tr></table>';
+    echo "<br><center><font color=\"$color[2]\">" .
+         _("Some or all of the help documents are not present!").
+         '</font></center>'.
+         '</td></tr></table>';
     /* this is really silly, because there may be some
      * footers. What about them.
      * TODO: Fix this so it's not just "exit".
@@ -165,35 +166,35 @@ if ($help_exists == true) {
     }
 
     if (!isset($chapter)) {
-        echo '<table cellpadding="0" cellspacing="0" border="0" 
-              align="center"><tr><td>';
-        echo '<b><center>' . _("Table of Contents") . '</center></b><br>';
+        echo html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' );
+	            html_tag( 'tr' ) .
+                        html_tag( 'td' ) .
+                             '<b><center>' . _("Table of Contents") . '</center></b><br>';
         do_hook('help_chapter');
-        echo '<ol>';
+        echo html_tag( 'ol' );
         for ($i=0; $i < count($helpdir); $i++) {
             $doc = file("../help/$user_language/$helpdir[$i]");
             $help_info = get_info($doc, 0);
-            echo '<li><a href="../src/help.php?chapter=' . ($i+1) 
-                 . '">' . $help_info[0] . '</a>';
-                 echo '<ul>' . $help_info[2] . '</ul>';
+            echo '<li><a href="../src/help.php?chapter=' . ($i+1)
+                 . '">' . $help_info[0] . '</a>' .
+                 html_tag( 'ul', $help_info[2] );
         }
-        echo '</ol>';
-        echo '</td></tr></table>';
+        echo '</ol></td></tr></table>';
     } else {
         $doc = file("../help/$user_language/" . $helpdir[$chapter-1]);
         $help_info = get_info($doc, 0);
         echo '<small><center>';
         if ($chapter <= 1){
-            echo '<font color="' . $color[9] . '">' . _("Previous") 
+            echo '<font color="' . $color[9] . '">' . _("Previous")
                  . '</font> | ';
         } else {
-            echo '<a href="../src/help.php?chapter=' . ($chapter-1) 
+            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 { 
+        } else {
             echo ' | <a href="../src/help.php?chapter=' . ($chapter+1)
                  . '">' . _("Next") . '</a>';
         }
@@ -204,17 +205,15 @@ if ($help_exists == true) {
         if (isset($help_info[1])){
             echo $help_info[1];
         } else {
-            echo '<p>' . $help_info[2] . '</p>';
+            echo html_tag( 'p', $help_info[2], 'left' );
         }
              
         $section = 0;
         for ($n = $help_info[3]; $n < count($doc); $n++) {
             $section++;
             $help_info = get_info($doc, $n);
-            echo "<b>$chapter.$section - $help_info[0]</b>";
-            echo '<ul>';
-            echo $help_info[1];
-            echo '</ul>';
+            echo "<b>$chapter.$section - $help_info[0]</b>" .
+                html_tag( 'ul', $help_info[1] );
             $n = $help_info[3];
         }
 
@@ -222,7 +221,9 @@ if ($help_exists == true) {
     }
 }
 do_hook('help_bottom');
+
+echo html_tag( 'tr',
+            html_tag( 'td', '&nbsp;', 'left', $color[0] )
+        ).
+       '</table></body></html>';
 ?>
-<tr><td bgcolor="<?php echo $color[0] ?>">&nbsp;</td></tr></table>
-<td></tr></table>
-</body></html>