Filter plugin fixes...

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

diff --git a/ChangeLog b/ChangeLog
index 5eaa2473337296126bd46ac3722a754f1515e54e..540f9abf1cb50a3d0e9c41af320545e6c8cf1797 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Version 1.2.6 -- CVS
   - Fixed resume draft bug #513521, #514639
   - Newmail plugin: admin can disablethe use of audio (patch #517698)
   - Fixed quoting problem in safe html (patch #516542)
   - Fixed resume draft bug #513521, #514639
   - Newmail plugin: admin can disablethe use of audio (patch #517698)
   - Fixed quoting problem in safe html (patch #516542)

+  - SPAM folder no longer special folder (filters plugin)
+  - Filtering now happens on folder list refresh (filters plugin)

        
 Version 1.2.5 -- 22 February 2002
 ---------------------------------
        
 Version 1.2.5 -- 22 February 2002
 ---------------------------------

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index e462a2734aae7c4209a6384d5b2c0dab520495c3..11f093321d7d63a65b38bb636173c3ac90bee0c4 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -111,7 +111,7 @@ function start_filters() {
         $imap_general, $filters, $imap_stream, $imapConnection,
     $UseSeparateImapConnection, $AllowSpamFilters;
 
         $imap_general, $filters, $imap_stream, $imapConnection,
     $UseSeparateImapConnection, $AllowSpamFilters;
 

-    if ($mailbox == 'INBOX') {
+#    if ($mailbox == 'INBOX') {

         // Detect if we have already connected to IMAP or not.
         // Also check if we are forced to use a separate IMAP connection
         if ((!isset($imap_stream) && !isset($imapConnection)) ||
         // Detect if we have already connected to IMAP or not.
         // Also check if we are forced to use a separate IMAP connection
         if ((!isset($imap_stream) && !isset($imapConnection)) ||


@@ -140,7 +140,7 @@ function start_filters() {
         if (!$previously_connected) {
             sqimap_logout($stream);
         }
         if (!$previously_connected) {
             sqimap_logout($stream);
         }

-    }
+#    }

 }
 
 
 }
 
 

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index bb5d7ed636734fed5e00f88d855173afac0dfee4..96bd4ee25b5c0c1cc9a49ad1253e228ab4e000e9 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -76,7 +76,7 @@ function squirrelmail_plugin_init_filters() {
         $squirrelmail_plugin_hooks['right_main_after_header']['filters'] = 'start_filters';
     }
     $squirrelmail_plugin_hooks['optpage_register_block']['filters'] = 'squirrelmail_plugin_optpage_register_block';
         $squirrelmail_plugin_hooks['right_main_after_header']['filters'] = 'start_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['special_mailbox']['filters'] = 'filters_special_mailbox';

 }
 
 function filters_special_mailbox( $mb ) {
 }
 
 function filters_special_mailbox( $mb ) {