added hooks for allbox plugin

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@801 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 667c795a415f02bb7b5a38ebc524df478fc2d52e..c8d9777b0f4915bec7152c4f687f78ad04735bb8 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -155,8 +155,8 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
          echo "         <NOBR><SMALL><INPUT TYPE=SUBMIT VALUE=\"". _("Delete") ."\">&nbsp;". _("checked messages") ."</SMALL></NOBR>\n";
          echo "      </TD>";
          echo "   </TR>\n";
-   
-         echo "</TABLE>\n\n\n";
+         echo "</TABLE>\n";
+         do_hook("mailbox_form_before");
          echo "</TD></TR>";
          echo "<TR><TD BGCOLOR=\"$color[0]\">";
          echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">";

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index c06adbef61cb365957280d4020ebef28c67cebef..1bcd9bf62e931d2a4bbf4da5dc7a7bb239b9f320 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -274,7 +274,6 @@
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
 
       echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage\">";
-      do_hook("mailbox_form_before");
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
@@ -298,7 +297,8 @@
       echo "      </TD>";
       echo "   </TR>\n";
 
-      echo "</TABLE>\n\n\n";
+      echo "</TABLE>\n";
+      do_hook("mailbox_form_before");
       echo "</TD></TR>";
 
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
@@ -383,7 +383,7 @@
             next($msort);
          } while ($i < ($endMessage+1));
       }
-      echo "</FORM></TABLE>";
+      echo "</TABLE>";
 
       echo "</TABLE>\n";
       echo "</TD></TR>\n";
@@ -401,6 +401,7 @@
          echo "<FONT COLOR=\"$color[9]\">" . _("Previous"). "</FONT> | \n";
          echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
       }
+      echo "</form>";
       echo "</TD></TR></table>"; /** End of message-list table */
 
       do_hook("mailbox_index_after");