- added help on search
- added ending html tags in html addressbook search
- fixed plugin error on login page
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@675
7612ce4b-ef26-0410-bec9-
ea0150e637f0
12 files changed:
generic_header functions/page_header.php
menuline functions/page_header.php
compose_button_row src/compose.php
generic_header functions/page_header.php
menuline functions/page_header.php
compose_button_row src/compose.php
+ compose_bottom src/compose.php
left_main_before src/left_main.php
left_main_after src/left_main.php
options_save src/options.php (see note on options)
options_link_and_description src/options.php (see note on options)
left_main_before src/left_main.php
left_main_after src/left_main.php
options_save src/options.php (see note on options)
options_link_and_description src/options.php (see note on options)
+ options_highlight_bottom src/options_highlight.php
+ options_personal_bottom src/options_personal.php
+ options_display_bottom src/options_display.php
+ options_folders_bottom src/options_folders.php
logout src/signout.php
login_before src/webmail.php
login_verified src/webmail.php
logout src/signout.php
login_before src/webmail.php
login_verified src/webmail.php
help_top src/help.php
help_bottom src/help.php
help_chapter src/help.php
help_top src/help.php
help_bottom src/help.php
help_chapter src/help.php
+ abook_html_search_below src/addrbook_search_html.php
include("../functions/display_messages.php");
if (!isset($addressbook_php))
include("../functions/addressbook.php");
include("../functions/display_messages.php");
if (!isset($addressbook_php))
include("../functions/addressbook.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
include("../src/load_prefs.php");
include("../src/load_prefs.php");
// Search form
print "<CENTER>\n";
// Search form
print "<CENTER>\n";
- printf('<FORM METHOD=post ACTION="%s?html_addr_search=true">'."\n",
+ printf('<FORM METHOD=post NAME=f ACTION="%s?html_addr_search=true">'."\n",
$PHP_SELF);
print "<TABLE BORDER=0>\n";
printf("<TR><TD NOWRAP VALIGN=middle>\n");
$PHP_SELF);
print "<TABLE BORDER=0>\n";
printf("<TR><TD NOWRAP VALIGN=middle>\n");
addr_insert_hidden();
print "</FORM>";
print "</CENTER>";
addr_insert_hidden();
print "</FORM>";
print "</CENTER>";
+ do_hook("addrbook_html_search_below");
// End search form
// Show personal addressbook
// End search form
// Show personal addressbook
// Display the "new address" form
// Display the "new address" form
- printf("<FORM ACTION=\"%s\" METHOD=\"POST\">\n", $PHP_SELF);
+ printf("<FORM ACTION=\"%s\" NAME=f_add METHOD=\"POST\">\n", $PHP_SELF);
print "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
print "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n<STRONG>";
printf(_("Add to %s"), $abook->localbackendname);
print "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
print "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n<STRONG>";
printf(_("Add to %s"), $abook->localbackendname);
echo "</TABLE>\n";
echo "</FORM>";
echo "</TABLE>\n";
echo "</FORM>";
+ do_hook("compose_bottom");
}
function showSentForm () {
}
function showSentForm () {
include("../functions/imap.php");
if (!isset($array_php))
include("../functions/array.php");
include("../functions/imap.php");
if (!isset($array_php))
include("../functions/array.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
include("../src/load_prefs.php");
include("../src/load_prefs.php");
echo _("Create Folder");
echo "</TD></TR>";
echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
echo _("Create Folder");
echo "</TD></TR>";
echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
- echo "<FORM ACTION=\"folders_create.php\" METHOD=\"POST\">\n";
+ echo "<FORM NAME=cf ACTION=\"folders_create.php\" METHOD=\"POST\">\n";
echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n";
echo _("as a subfolder of");
echo "<BR>";
echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n";
echo _("as a subfolder of");
echo "<BR>";
echo _("No folders were found to subscribe to!") . "</td></tr></table>";
}
echo _("No folders were found to subscribe to!") . "</td></tr></table>";
}
+ do_hook("folders_bottom");
sqimap_logout($imapConnection);
?>
</BODY></HTML>
sqimap_logout($imapConnection);
?>
</BODY></HTML>
$helpdir[4] = "addresses.hlp";
$helpdir[5] = "folders.hlp";
$helpdir[6] = "options.hlp";
$helpdir[4] = "addresses.hlp";
$helpdir[5] = "folders.hlp";
$helpdir[6] = "options.hlp";
- $helpdir[7] = "FAQ.hlp";
+ $helpdir[7] = "search.hlp";
+ $helpdir[8] = "FAQ.hlp";
/****************[ HELP FUNCTIONS ]********************/
// parses through and gets the information from the different documents.
/****************[ HELP FUNCTIONS ]********************/
// parses through and gets the information from the different documents.
<center><b><?php echo _("Help") ?></b></center>
</td></tr></table>
<center><b><?php echo _("Help") ?></b></center>
</td></tr></table>
-<? do_hook("help_top") ?>
+<?php do_hook("help_top") ?>
<table width=90% cellpadding=0 cellspacing=10 border=0 align=center><tr><td>
<?php
<table width=90% cellpadding=0 cellspacing=10 border=0 align=center><tr><td>
<?php
$context = "index";
else if (strpos($ref, "src/read_body"))
$context = "read";
$context = "index";
else if (strpos($ref, "src/read_body"))
$context = "read";
+ else if (strpos($ref, "src/search"))
+ $context = "search";
}
if (file_exists("../help/$squirrelmail_language")) {
}
if (file_exists("../help/$squirrelmail_language")) {
$chapter = 2;
else if ($context == "read")
$chapter = 3;
$chapter = 2;
else if ($context == "read")
$chapter = 3;
+ else if ($context == "search")
+ $chapter = 8;
if (!$chapter) {
echo "<table cellpadding=0 cellspacing=0 border=0 align=center><tr><td>\n";
if (!$chapter) {
echo "<table cellpadding=0 cellspacing=0 border=0 align=center><tr><td>\n";
include("../functions/strings.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
include("../functions/strings.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
// let's check to see if they compiled with gettext support
if (!function_exists("_")) {
// let's check to see if they compiled with gettext support
if (!function_exists("_")) {
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ if (!isset($plugin_php))
+ include("../functins/plugin.php");
include("../src/load_prefs.php");
displayPageHeader($color, "None");
include("../src/load_prefs.php");
displayPageHeader($color, "None");
<center><b><?php echo _("Options") . " - " . _("Display Preferences"); ?></b></center>
</td></tr></table>
<center><b><?php echo _("Options") . " - " . _("Display Preferences"); ?></b></center>
</td></tr></table>
- <form action="options.php" method=post>
+ <form name=f action="options.php" method=post>
<table width=100% cellpadding=0 cellspacing=2 border=0>
<tr>
<td align=right nowrap><?php echo _("Theme"); ?>:
<table width=100% cellpadding=0 cellspacing=2 border=0>
<tr>
<td align=right nowrap><?php echo _("Theme"); ?>:
+ <?php do_hook("options_display_bottom"); ?>
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
include("../src/load_prefs.php");
displayPageHeader($color, "None");
include("../src/load_prefs.php");
displayPageHeader($color, "None");
<center><b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b></center>
</td></tr></table>
<center><b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b></center>
</td></tr></table>
- <form action="options.php" method=post>
+ <form name=f action="options.php" method=post>
<table width=100% cellpadding=0 cellspacing=2 border=0>
<?php if ($show_prefix_option == true) { ?>
<table width=100% cellpadding=0 cellspacing=2 border=0>
<?php if ($show_prefix_option == true) { ?>
+ <?php do_hook("options_folders_bottom"); ?>
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
if ($action == "delete" && isset($theid)) {
if ($action == "delete" && isset($theid)) {
else if (!$selected_choose)
$selected_input = " checked";
else if (!$selected_choose)
$selected_input = " checked";
- echo "<form action=\"options_highlight.php\">\n";
+ echo "<form name=f action=\"options_highlight.php\">\n";
echo "<input type=\"hidden\" value=\"save\" name=\"action\">\n";
echo "<input type=\"hidden\" value=\"$theid\" name=\"theid\">\n";
echo "<table width=80% align=center cellpadding=3 cellspacing=0 border=0>\n";
echo "<input type=\"hidden\" value=\"save\" name=\"action\">\n";
echo "<input type=\"hidden\" value=\"$theid\" name=\"theid\">\n";
echo "<table width=80% align=center cellpadding=3 cellspacing=0 border=0>\n";
echo "</table>\n";
echo "<center><input type=\"submit\" value=\"" . _("Submit") . "\"></center>\n";
echo "</form>\n";
echo "</table>\n";
echo "<center><input type=\"submit\" value=\"" . _("Submit") . "\"></center>\n";
echo "</form>\n";
+ do_hook("options_highlight_bottom");
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
include("../functions/array.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
include("../src/load_prefs.php");
displayPageHeader($color, "None");
include("../src/load_prefs.php");
displayPageHeader($color, "None");
<center><b><?php echo _("Options") . " - " . _("Personal Information"); ?></b></center>
</td></tr></table>
<center><b><?php echo _("Options") . " - " . _("Personal Information"); ?></b></center>
</td></tr></table>
- <form action="options.php" method=post>
+ <form name=f action="options.php" method=post>
<table width=100% cellpadding=0 cellspacing=2 border=0>
<tr>
<td align=right nowrap><?php echo _("Full Name"); ?>:
<table width=100% cellpadding=0 cellspacing=2 border=0>
<tr>
<td align=right nowrap><?php echo _("Full Name"); ?>:
+ <?php do_hook("options_personal_bottom"); ?>
</td></tr>
<tr><td align=center>";
</td></tr>
<tr><td align=center>";
- echo "<FORM ACTION=\"search.php\">\n";
+ echo "<FORM ACTION=\"search.php\" NAME=s>\n";
echo " <TABLE WIDTH=75%>\n";
echo " <TR>\n";
echo " <TD WIDTH=33%>\n";
echo " <TABLE WIDTH=75%>\n";
echo " <TR>\n";
echo " <TD WIDTH=33%>\n";