- 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

diff --git a/doc/plugin.txt b/doc/plugin.txt
index 0a5183a3d23acc159e0e8565a5ec4331e26ceb78..fd81cd2aad0f44fa9a03b5355d9c6b9bb9f6dbaa 100644 (file)
--- 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 0c5bc0b68ff8d7572bc56d3940f9ea66e801c9cf..6f8259ffd89dc3c5e5b85ff4e74e448026bcabea 100644 (file)
--- 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 "<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");
@@ -153,6 +155,7 @@
    addr_insert_hidden();
    print "</FORM>";
    print "</CENTER>";
+   do_hook("addrbook_html_search_below");
    // End search form
 
    // Show personal addressbook
@@ -206,3 +209,4 @@
    }
 
 ?>
+</body></html>

diff --git a/src/addressbook.php b/src/addressbook.php
index 685ea8365a84c0a1136562e10cbf6048482e0e9e..32f5d9a092add06e15435dbeeba62ad9b0ea542d 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -350,7 +350,7 @@
 
 
    // 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);

diff --git a/src/compose.php b/src/compose.php
index 3936710f15aa8e0d2c96c58e2b0ebfb49ffa5890..afc4652203ee303c62c704a62d67dff46738d005 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -272,6 +272,7 @@
 
       echo "</TABLE>\n";
       echo "</FORM>";
+      do_hook("compose_bottom");
    }
 
    function showSentForm () {

diff --git a/src/folders.php b/src/folders.php
index 80697f038eb46dd32182ae5a3e2b5b2ba23deef7..66d62164c8c8fd0abb0732c26ff7bf410fa3c865 100644 (file)
--- 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 "</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>";
@@ -307,6 +309,7 @@
       echo _("No folders were found to subscribe to!") . "</td></tr></table>";
    }
 
+   do_hook("folders_bottom");
    sqimap_logout($imapConnection);
 ?>
 </BODY></HTML>

diff --git a/src/help.php b/src/help.php
index e7632938a75062ce0b96fff6dbddd447c05c18ff..3ef81b7cb80e4c080aa9fe39d6dfae0344c135c4 100644 (file)
--- 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 @@
    <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
@@ -109,6 +110,8 @@
          $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")) {
@@ -142,6 +145,8 @@
          $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";

diff --git a/src/login.php b/src/login.php
index 22b739ad85a5558820ed5b9db691544ee6d5dd8f..cc4de2133a43c226eeaed880a5ff7187a6aebb5b 100644 (file)
--- 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 5dabd931b86a186d5814ea4878b74bdd19d70527..2d53e39c7f85aacedbe0c2113cf5876cb466dee8 100644 (file)
--- 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 @@
       <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"); ?>:
@@ -266,4 +268,5 @@
          </tr>
       </table>   
    </form>
+   <?php do_hook("options_display_bottom"); ?>
 </body></html>

diff --git a/src/options_folder.php b/src/options_folder.php
index a9efbba2eab52999dff296305aff723247727c37..9714fc3c33787e2b87e1fa413242443992b67496 100644 (file)
--- 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 @@
       <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) {   ?>   
@@ -139,4 +141,5 @@
          </tr>
       </table>
    </form>
+   <?php do_hook("options_folders_bottom"); ?>
 </body></html>

diff --git a/src/options_highlight.php b/src/options_highlight.php
index 8529ab6ac04137993ff4417e83b4973b4eecd889..490d24b2d7f9dd31cca39059adff28a656dd9254 100644 (file)
--- 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 "<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";
@@ -184,6 +186,7 @@
       echo "</table>\n";
       echo "<center><input type=\"submit\" value=\"" . _("Submit") . "\"></center>\n";
       echo "</form>\n";
+      do_hook("options_highlight_bottom");
    } 
 ?>
 </body></html>

diff --git a/src/options_personal.php b/src/options_personal.php
index f140316fba096b906f6d49119bb6f82e3b49c1e3..495ba5730adc2cd3621077865b2deae139a52d17 100644 (file)
--- 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 @@
       <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"); ?>:
@@ -82,4 +84,5 @@
          </tr>
       </table>   
    </form>
+   <?php do_hook("options_personal_bottom"); ?>
 </body></html>

diff --git a/src/search.php b/src/search.php
index de730d096deb3a7f7bbff3d35b934ae8a65da7e3..9c33400e32c00443dafb085faec41c2177af8921 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -36,7 +36,7 @@
       </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";