if encoding function can't find charset, it does us-ascii encoding.

[squirrelmail.git] / src / help.php

diff --git a/src/help.php b/src/help.php
index 177e161695e965bc1cabe6063ee7eb87b95d2742..29df95cc7034bdf5ffa3f9f26e69bd1c168b8bee 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -3,19 +3,24 @@
 /**
  * help.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Displays help for the user
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 
 displayPageHeader($color, 'None' );
@@ -77,13 +82,13 @@ function get_info($doc, $pos) {
                 $ary[1] = $ary[0];
                 $ary[2] = $ary[0];
             }
-           return( $ary );
+            return( $ary );
         } else if (!trim(strtolower($doc[$n]))) {
-            $ary[0] = '';
-            $ary[1] = '';
-            $ary[2] = '';
-            $ary[3] = $n;
-       }
+            $ary[0] = '';
+            $ary[1] = '';
+            $ary[2] = '';
+            $ary[3] = $n;
+        }
     }
     $ary[0] = _("ERROR: Help files are not in the right format!");
     $ary[1] = $ary[0];
@@ -115,8 +120,8 @@ if (file_exists("../help/$squirrelmail_language")) {
     $user_language = $squirrelmail_language;
 } else if (file_exists('../help/en_US')) {
     echo "<center><font color=\"$color[2]\">";
-    printf (_("The help has not been translated to %s.  It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
-    echo '</font></center><br>';
+    printf (_("The help has not been translated to %s. It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
+    echo '</font></center><br />';
     $user_language = 'en_US';
 } else {
     error_box( _("Some or all of the help documents are not present!"), $color );
@@ -128,13 +133,10 @@ if (file_exists("../help/$squirrelmail_language")) {
  * else see if we can get a relevant chapter from the referer */
 $chapter = 0;
 
-if ( isset( $_GET['chapter'] ) )
-{
-    $chapter = intval( $_GET['chapter']);
-}
-elseif (isset($_SERVER['HTTP_REFERER']))
-{
-    $ref = strtolower($_SERVER['HTTP_REFERER']);
+if ( sqgetGlobalVar('chapter', $temp, SQ_GET) ) {
+    $chapter = (int) $temp;
+} elseif ( sqgetGlobalVar('HTTP_REFERER', $temp, SQ_SERVER) ) {
+    $ref = strtolower($temp);
 
     $contexts = array ( 'src/compose' => 4, 'src/addr' => 5,
         'src/folders' => 6, 'src/options' => 7, 'src/right_main' => 2,
@@ -149,11 +151,10 @@ elseif (isset($_SERVER['HTTP_REFERER']))
 }
 
 if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
-    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 html_tag( 'table', '', 'center', '', 'cellpadding="0" cellspacing="0" border="0"' ) .
+         html_tag( 'tr' ) .
+         html_tag( 'td' ) .
+         '<b><center>' . _("Table of Contents") . '</center></b><br />';
     echo html_tag( 'ol' );
     for ($i=0, $cnt = count($helpdir); $i < $cnt; $i++) {
         $doc = file("../help/$user_language/$helpdir[$i]");
@@ -162,6 +163,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
              . '">' . $help_info[0] . '</a>' .
              html_tag( 'ul', $help_info[2] );
     }
+    do_hook('help_chapter');
     echo '</ol></td></tr></table>';
 } else {
     $doc = file("../help/$user_language/" . $helpdir[$chapter-1]);
@@ -181,10 +183,10 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
         echo ' | <a href="../src/help.php?chapter=' . ($chapter+1)
              . '">' . _("Next") . '</a>';
     }
-    echo '</center></small><br>';
+    echo '</center></small><br />';
 
     echo '<font size="5"><b>' . $chapter . ' - ' . $help_info[0]
-         . '</b></font><br><br>';
+         . '</b></font><br /><br />';
 
     if (isset($help_info[1]) && $help_info[1]) {
         echo $help_info[1];
@@ -198,16 +200,16 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
         $help_info = get_info($doc, $n);
         echo "<b>$chapter.$section - $help_info[0]</b>" .
             html_tag( 'ul', $help_info[1] );
-       $n = $help_info[3];
+        $n = $help_info[3];
     }
 
-    echo '<br><center><a href="#pagetop">' . _("Top") . '</a></center>';
+    echo '<br /><center><a href="#pagetop">' . _("Top") . '</a></center>';
 }
 
 do_hook('help_bottom');
 
 echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[0] )
-        ).
-       '</table></body></html>';
+        );
 ?>
+</table></body></html>
\ No newline at end of file