Add workaround for Mercury/32 servers that will subscribe again to

an already subscribed folder (#1115409).

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

diff --git a/ChangeLog b/ChangeLog
index 71444d6fc736c9ce53a8e54500c637e9bc17b2c9..6e28c087c5f80f09bcabdcc81156889150c491d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -207,6 +207,8 @@ Version 1.5.1 -- CVS
   - Fixed sorting problem is get_squirrel_sort() function (#1115403).
   - Add "Show Only Subscribed Folders" option to allow users to show all
     folders instead of only subscribed ones (#1105756, #1105250).
+  - Add workaround for Mercury/32 servers that will subscribe again to
+    an already subscribed folder (#1115409).
 
 Version 1.5.0
 --------------------

diff --git a/src/left_main.php b/src/left_main.php
index 027fa990946052e95dfcd223d3c42c286b0bc4d3..38e622e77e9eb741c71047ca64eed00f3f3bc5ce 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -890,10 +890,14 @@ if ($auto_create_special && !isset($auto_create_done)) {
             if ( !sqimap_mailbox_exists($imapConnection, $folder)) {
                 sqimap_mailbox_create($imapConnection, $folder, '');
             } else {
-                //if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
-                // check for subscription is useless and expensive  just
-                // surpress the NO response
-                sqimap_subscribe($imapConnection, $folder, false);
+                // check for subscription is useless and expensive, just
+                // surpress the NO response. Unless we're on Mecury, which
+                // will just subscribe a folder again if it's already
+                // subscribed.
+                if ( strtolower($imap_server_type) != 'mercury32' ||
+                    !sqimap_mailbox_is_subscribed($imapConnection, $folder) ) {
+                    sqimap_subscribe($imapConnection, $folder, false);
+                }
             }
         }
     }