filter fix on folder/rename is back in. added hooks back to imap_mailbox.php, reworke...

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index d392c134ff508597064286ea4ae42390f90e2392..2ecd675716de939d484f1f6df886ee8ecb66f80d 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -184,7 +184,7 @@ function sqimap_mailbox_delete ($imap_stream, $mailbox)
     $read_ary = sqimap_run_command($imap_stream, "DELETE \"$mailbox\"",
                                  TRUE, $response, $message);
     sqimap_unsubscribe ($imap_stream, $mailbox);
- //   do_hook("rename_or_delete_folder");
+       do_hook_function("rename_or_delete_folder",$args = array($mailbox, 'delete', ''));
 }
 
 /***********************************************************************
@@ -222,7 +222,7 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
                                  TRUE, $response, $message);
         sqimap_unsubscribe($imap_stream, $old_name.$postfix);
         sqimap_subscribe($imap_stream, $new_name.$postfix);
-//        do_hook("rename_or_delete_folder");
+        do_hook_function("rename_or_delete_folder",$args = array($old_name, 'rename', $new_name));
         $l = strlen( $old_name ) + 1;
         $p = 'unformatted';
         foreach ( $boxesall as $box ) {
@@ -235,7 +235,7 @@ function sqimap_mailbox_rename( $imap_stream, $old_name, $new_name ) {
                 }
                 sqimap_unsubscribe($imap_stream, $box[$p]);
                 sqimap_subscribe($imap_stream, $new_sub);
-            //    do_hook("rename_or_delete_folder");
+                       do_hook_function("rename_or_delete_folder",$args = array($box[$p], 'rename', $new_sub));
             }
         }
     }

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 1550fa541d299dd9b79a4affe52ca55408d8db99..5259d1bb6eab19f8af377af0663037369e8dbb6d 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -707,7 +707,10 @@ function filter_swap($id1, $id2) {
 
 /* This update the filter rules when
    renaming or deleting folders */
-function update_for_folder ($old_folder, $action, $new_folder = 'INBOX') {
+function update_for_folder ($args) {
+    $old_folder = $args[0];
+       $new_folder = $args[2];
+       $action = $args[1];
     global $plugins, $data_dir, $username;
     $filters = array();
     $filters = load_filters();

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index 99e9357bb01096bcb4b4902487808547e6538897..a3906273af4070abe5a5b52fefa3bbeec5301dad 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -86,7 +86,7 @@ function squirrelmail_plugin_init_filters() {
     }
     $squirrelmail_plugin_hooks['optpage_register_block']['filters'] = 'squirrelmail_plugin_optpage_register_block';
 #    $squirrelmail_plugin_hooks['special_mailbox']['filters'] = 'filters_special_mailbox';
-//    $squirrelmail_plugin_hooks['rename_or_delete_folder']['filters'] = 'update_for_folder';
+    $squirrelmail_plugin_hooks['rename_or_delete_folder']['filters'] = 'update_for_folder';
 }
 
 function filters_special_mailbox( $mb ) {