Trying to make both uw and cyrus work with special folders.

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index c4e976417ab2cb5a9673106843d2aac1c13d85b6..c221dbd91653792d04c543455a4601f5e03865bf 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -21,26 +21,28 @@ function isSpecialMailbox( $box ) {
            $move_to_trash, $move_to_sent, $save_as_draft,
            $delimiter, $folder_prefix, $imap_server_type;
 
-    if ( $move_to_sent  ) {
-        if ( $imap_server_type == 'uw' ) {
-            $i = strpos( $sent_folder, $delimiter, strlen( $folder_prefix ) );
-            if ( $i === FALSE ) {
-                $i = strlen( $box );
-            }
+    if ( $imap_server_type == 'uw' ) {
+        $boxs = $box;
+        $i = strpos( $sent_folder, $delimiter, strlen( $folder_prefix ) );
+        if ( $i === FALSE ) {
+            $i = strlen( $box );
+        }
+    } else {
+        $boxs = $box . $delimiter;
+        // Skip next second delimiter
+        $i = strpos( $sent_folder, $delimiter );
+        $i = strpos( $sent_folder, $delimiter, $i + 1  );
+        if ( $i === FALSE ) {
+            $i = strlen( $box );
         } else {
-            // Skip next second delimiter
-            $i = strpos( $sent_folder, $delimiter );
-            $i = strpos( $sent_folder, $delimiter, $i+ 1  ) + 1;
-            if ( $i === FALSE ) {
-                $i = strlen( $box );
-            }
+            $i++;
         }
     }
 
     $ret = ( (strtolower($box) == 'inbox') ||
-             ($box == $trash_folder &&
+             ( substr( $trash_folder, 0, $i ) == substr( $boxs, 0, $i ) &&
               $move_to_trash) ||
-             ( substr( $sent_folder, 0, $i ) == substr( $box, 0, $i ) &&
+             ( substr( $sent_folder, 0, $i ) == substr( $boxs, 0, $i ) &&
               $move_to_sent) ||
              ($box == $draft_folder &&
               $save_as_draft) );