Reenabled the move_messages_button_action hook and changed its name to mailbox_displa...

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

diff --git a/ChangeLog b/ChangeLog
index 3f443f384612c1d86d3cb9e71020e2cc305a8d64..4d8f6f875118e9aefd359a76f9b976b1e0835f12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,8 @@ Version 1.5.1 -- CVS
   - Changed structure of xtra_code functions that are used by some translations.
   - Added Uighur language support.
   - Added status bar to compose window when "Compose In New Window" is used.
+  - Reenabled the move_messages_button_action hook and changed its name to
+    mailbox_display_button_action to promote the new location
 
 Version 1.5.0
 --------------------

diff --git a/doc/plugin.txt b/doc/plugin.txt
index 032c3e22c3e446d1732029df0dd77ba88b4b3b50..fee3e92203e488b388b1f267f40ce8841f12461c 100644 (file)
--- a/doc/plugin.txt
+++ b/doc/plugin.txt
@@ -248,6 +248,7 @@ but may be out of date soon thereafter.  You never know.  ;-)
   check_handleAsSent_result      functions/mailbox_display.php   do_hook
   subject_link                   functions/mailbox_display.php   concat_hook
   mailbox_display_buttons        functions/mailbox_display.php   do_hook
+  mailbox_display_button_action  functions/mailbox_display.php   hook_func
   message_body                   functions/mime.php              do_hook
   ^ attachment $type0/$type1     functions/mime.php              do_hook
   attachments_bottom             functions/mime.php              hook_func
@@ -273,8 +274,6 @@ but may be out of date soon thereafter.  You never know.  ;-)
   login_top                      src/login.php                   do_hook
   login_form                     src/login.php                   do_hook
   login_bottom                   src/login.php                   do_hook
-  move_before_move               src/move_messages.php           do_hook
-  move_messages_button_action    src/move_messages.php           concat_hook
   * optpage_set_loadinfo         src/options.php                 do_hook
   * optpage_loadhook_personal    src/options.php                 do_hook
   * optpage_loadhook_display     src/options.php                 do_hook

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index d353415a2cee961dc6360a810713cd05b84e7fc6..53b67c41e73466ee7c7699abcf2f73fa7da490c9 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1867,11 +1867,8 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar
                 !in_array($aUid[0],$aMailbox['UIDSET'][$aMailbox['SETINDEX']])) {
                 break;
             }
-            // What kind of hook is this, can it be removed? Disabled for now because it can invalidate the cache
-            //if (!boolean_hook_function('move_messages_button_action', NULL, 1)) {
-                $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash);
-                $bExpunge = true;
-            //}
+            $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash);
+            $bExpunge = true;
             break;
           case 'unsetDeleted':
           case 'setSeen':
@@ -1899,6 +1896,10 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar
                 $aMailbox['FORWARD_SESSION'] = $composesession;
             }
             break;
+          default:
+            // Hook for plugin buttons
+            do_hook_function('mailbox_display_button_action', $aUid);
+            break;
         }
         /**
          * Updates messages is an array containing the result of the untagged