projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 f9d07b51aa3c28bd06a0197eccc18c5ebc200461..2c0798c7d9cd671e8d5912ef17698e5b1b5adc42 100644
(file)
--- a/
src/help.php
+++ b/
src/help.php
@@
-111,11
+111,14
@@
if (!isset($squirrelmail_language)) {
if (file_exists("../help/$squirrelmail_language")) {
$user_language = $squirrelmail_language;
} else if (file_exists('../help/en_US')) {
if (file_exists("../help/$squirrelmail_language")) {
$user_language = $squirrelmail_language;
} else if (file_exists('../help/en_US')) {
- error_box(_("Help is not available in the selected language. It will be displayed in English instead.")
, $color
);
+ error_box(_("Help is not available in the selected language. It will be displayed in English instead."));
echo '<br />';
$user_language = 'en_US';
} else {
echo '<br />';
$user_language = 'en_US';
} else {
- error_box( _("Help is not available. Please contact your system administrator for assistance."), $color );
+ error_box( _("Help is not available. Please contact your system administrator for assistance."));
+ echo '</td></tr></table>';
+ // Display footer (closes HTML tags) and stop script execution.
+ $oTemplate->display('footer.tpl');
exit;
}
exit;
}
@@
-174,6
+177,7
@@
if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
echo html_tag( 'ol' );
// Write the TOC chapters.
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] );
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] );
@@
-195,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]);
} 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 i
n not available in the selected language. It will be displayed in English instead."), $color
);
+ error_box(_("This chapter i
s 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.
echo '<br />';
} else {
// If English can't be found, the chapter went MIA.
@@
-238,14
+242,14
@@
if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
$section++;
$help_info = get_info($doc, $n);
echo "<b>$chapter.$section - $help_info[0]</b>" .
$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];
}
echo '<br /><div style="text-align: center;"><a href="#pagetop">' . _("Top") . '</a></div>';
} else {
// If the help file went MIA, display an error message.
$n = $help_info[3];
}
echo '<br /><div style="text-align: center;"><a href="#pagetop">' . _("Top") . '</a></div>';
} else {
// If the help file went MIA, display an error message.
- error_box(sprintf(_("For some reason, chapter %s is not available."), $chapter)
, $color
);
+ error_box(sprintf(_("For some reason, chapter %s is not available."), $chapter));
}
}
}
}