From d7d3c4d435ff1820555e557fcccc9a9d52bf9e93 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Fri, 4 Aug 2000 08:03:06 +0000 Subject: [PATCH] - added more hooks - 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 --- doc/plugin.txt | 6 ++++++ src/addrbook_search_html.php | 6 +++++- src/addressbook.php | 2 +- src/compose.php | 1 + src/folders.php | 5 ++++- src/help.php | 9 +++++++-- src/login.php | 2 ++ src/options_display.php | 5 ++++- src/options_folder.php | 5 ++++- src/options_highlight.php | 5 ++++- src/options_personal.php | 5 ++++- src/search.php | 2 +- 12 files changed, 43 insertions(+), 10 deletions(-) diff --git a/doc/plugin.txt b/doc/plugin.txt index 0a5183a3..fd81cd2a 100644 --- a/doc/plugin.txt +++ b/doc/plugin.txt @@ -79,10 +79,15 @@ List of hooks 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) + 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 @@ -101,6 +106,7 @@ List of hooks help_top src/help.php help_bottom src/help.php help_chapter src/help.php + abook_html_search_below src/addrbook_search_html.php Options ------- diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 0c5bc0b6..6f8259ff 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -32,6 +32,8 @@ 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"); @@ -120,7 +122,7 @@ // Search form print "
\n"; - printf('
'."\n", + printf(''."\n", $PHP_SELF); print "\n"; printf(""; echo "
\n"); @@ -153,6 +155,7 @@ addr_insert_hidden(); print ""; print ""; + do_hook("addrbook_html_search_below"); // End search form // Show personal addressbook @@ -206,3 +209,4 @@ } ?> + diff --git a/src/addressbook.php b/src/addressbook.php index 685ea836..32f5d9a0 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -350,7 +350,7 @@ // Display the "new address" form - printf("
\n", $PHP_SELF); + printf("\n", $PHP_SELF); print "\n"; print "
\n"; printf(_("Add to %s"), $abook->localbackendname); diff --git a/src/compose.php b/src/compose.php index 3936710f..afc46522 100644 --- a/src/compose.php +++ b/src/compose.php @@ -272,6 +272,7 @@ echo "
\n"; echo "
"; + do_hook("compose_bottom"); } function showSentForm () { diff --git a/src/folders.php b/src/folders.php index 80697f03..66d62164 100644 --- a/src/folders.php +++ b/src/folders.php @@ -22,6 +22,8 @@ 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"); @@ -151,7 +153,7 @@ echo _("Create Folder"); echo "
"; - echo "
\n"; + echo "\n"; echo "
\n"; echo _("as a subfolder of"); echo "
"; @@ -307,6 +309,7 @@ echo _("No folders were found to subscribe to!") . "
"; } + do_hook("folders_bottom"); sqimap_logout($imapConnection); ?> diff --git a/src/help.php b/src/help.php index e7632938..3ef81b7c 100644 --- a/src/help.php +++ b/src/help.php @@ -39,7 +39,8 @@ $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. @@ -91,7 +92,7 @@
- +
\n"; diff --git a/src/login.php b/src/login.php index 22b739ad..cc4de213 100644 --- a/src/login.php +++ b/src/login.php @@ -16,6 +16,8 @@ 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("_")) { diff --git a/src/options_display.php b/src/options_display.php index 5dabd931..2d53e39c 100644 --- a/src/options_display.php +++ b/src/options_display.php @@ -25,6 +25,8 @@ 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"); @@ -35,7 +37,7 @@
- +
: @@ -266,4 +268,5 @@
+ diff --git a/src/options_folder.php b/src/options_folder.php index a9efbba2..9714fc3c 100644 --- a/src/options_folder.php +++ b/src/options_folder.php @@ -25,6 +25,8 @@ 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"); @@ -38,7 +40,7 @@
-
+ @@ -139,4 +141,5 @@
+ diff --git a/src/options_highlight.php b/src/options_highlight.php index 8529ab6a..490d24b2 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -25,6 +25,8 @@ 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)) { @@ -113,7 +115,7 @@ else if (!$selected_choose) $selected_input = " checked"; - echo "
\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -184,6 +186,7 @@ echo "
\n"; echo "
\n"; echo "
\n"; + do_hook("options_highlight_bottom"); } ?> diff --git a/src/options_personal.php b/src/options_personal.php index f140316f..495ba573 100644 --- a/src/options_personal.php +++ b/src/options_personal.php @@ -25,6 +25,8 @@ 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"); @@ -39,7 +41,7 @@
-
+
: @@ -82,4 +84,5 @@
+ diff --git a/src/search.php b/src/search.php index de730d09..9c33400e 100644 --- a/src/search.php +++ b/src/search.php @@ -36,7 +36,7 @@ "; - echo "
\n"; + echo "\n"; echo " \n"; echo " \n"; echo "
\n"; -- 2.25.1