thomppj пре 23 година
родитељ
комит
76f82d690d
3 измењених фајлова са 5 додато и 3 уклоњено
  1. 2 0
      ChangeLog
  2. 2 2
      plugins/filters/filters.php
  3. 1 1
      plugins/filters/setup.php

+ 2 - 0
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)
+  - SPAM folder no longer special folder (filters plugin)
+  - Filtering now happens on folder list refresh (filters plugin)
 	
 Version 1.2.5 -- 22 February 2002
 ---------------------------------

+ 2 - 2
plugins/filters/filters.php

@@ -111,7 +111,7 @@ function start_filters() {
         $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)) ||
@@ -140,7 +140,7 @@ function start_filters() {
         if (!$previously_connected) {
             sqimap_logout($stream);
         }
-    }
+#    }
 }
 
 

+ 1 - 1
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['special_mailbox']['filters'] = 'filters_special_mailbox';
+#    $squirrelmail_plugin_hooks['special_mailbox']['filters'] = 'filters_special_mailbox';
 }
 
 function filters_special_mailbox( $mb ) {