X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fhelp.php;h=6318037d9e2df60e5e41c37c097405ae354a7052;hb=f38b7cf06c3343a7fead417d90bd67d291f5dc29;hp=5b43efa665f16a9c4cf8a201e99a215f3e9ac43e;hpb=f91f8bd8ca314b1453643f97a598620f9553ef14;p=squirrelmail.git
diff --git a/src/help.php b/src/help.php
index 5b43efa6..6318037d 100644
--- a/src/help.php
+++ b/src/help.php
@@ -3,7 +3,7 @@
/**
* help.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Displays help for the user
@@ -16,9 +16,8 @@ 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');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
displayPageHeader($color, 'None' );
@@ -41,11 +40,14 @@ $helpdir[8] = 'FAQ.hlp';
*/
function get_info($doc, $pos) {
+ $ary = array(0,0,0);
- for ($n=$pos; $n < count($doc); $n++) {
+ $cntdoc = count($doc);
+
+ for ($n=$pos; $n < $cntdoc; $n++) {
if (trim(strtolower($doc[$n])) == ''
|| trim(strtolower($doc[$n])) == '') {
- for ($n++;$n < count($doc)
+ for ($n++; $n < $cntdoc
&& (trim(strtolower($doc[$n])) != '')
&& (trim(strtolower($doc[$n])) != ''); $n++) {
if (trim(strtolower($doc[$n])) == '
') {
@@ -54,7 +56,7 @@ function get_info($doc, $pos) {
}
if (trim(strtolower($doc[$n])) == '') {
$ary[1] = '';
- for ($n++;$n < count($doc)
+ for ($n++;$n < $cntdoc
&& (trim(strtolower($doc[$n])) != '');
$n++) {
$ary[1] .= $doc[$n];
@@ -62,7 +64,7 @@ function get_info($doc, $pos) {
}
if (trim(strtolower($doc[$n])) == '') {
$ary[2] = '';
- for ($n++; $n < count($doc)
+ for ($n++; $n < $cntdoc
&& (trim(strtolower($doc[$n])) != '');
$n++) {
$ary[2] .= $doc[$n];
@@ -77,155 +79,129 @@ function get_info($doc, $pos) {
$ary[2] = $ary[0];
}
return( $ary );
- }
+ } else if (!trim(strtolower($doc[$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];
-
+ $ary[2] = $ary[0];
+ $ary[3] = $n;
return( $ary );
}
/**************[ END HELP FUNCTIONS ]******************/
-
echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td','' . _("Help") .'', 'center', $color[0] )
) ,
'center', '', 'width="95%" cellpadding="1" cellspacing="2" border="0"' );
-do_hook("help_top");
+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')){
- $context = 'compose';
- } else if (strpos($ref, 'src/addr')){
- $context = 'address';
- } else if (strpos($ref, 'src/folders')){
- $context = 'folders';
- } else if (strpos($ref, 'src/options')){
- $context = 'options';
- } else if (strpos($ref, 'src/right_main')){
- $context = 'index';
- } else if (strpos($ref, 'src/read_body')){
- $context = 'read';
- } else if (strpos($ref, 'src/search')){
- $context = 'search';
- }
-}
-
if (!isset($squirrelmail_language)) {
$squirrelmail_language = 'en_US';
}
if (file_exists("../help/$squirrelmail_language")) {
- $help_exists = true;
$user_language = $squirrelmail_language;
} else if (file_exists('../help/en_US')) {
- $help_exists = true;
echo "";
printf (_("The help has not been translated to %s. It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
echo '
';
$user_language = 'en_US';
} else {
- $help_exists = false;
- echo "
" .
- _("Some or all of the help documents are not present!").
- ''.
- '