* Fixed typo.

* Changed two negations and OR into one negation and AND
 - 1/2 the number of negations!  :-)

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

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 2233f238482f3df0f33ce696c95731d9f786bb97..6e4fe26aef93cc75a2ba9a1b044527ef3c67dbaf 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -258,15 +258,15 @@
 
          // Then list special folders and their subfolders
          for ($i = 0 ; $i <= count($boxes) ; $i++) {
-            if ((!strcasecmp($trash_folder, $boxes[$i]["unformatted"]) ||
-                !strcasecmp($trash_folder . $dm, $boxes[$i]["unformatted"] )
-               && ($move_to_trash)) {        
+            if (! (strcasecmp($trash_folder, $boxes[$i]["unformatted"]) &&
+                strcasecmp($trash_folder . $dm, $boxes[$i]["unformatted"] ))
+               && $move_to_trash) {
                $boxesnew[] = $boxes[$i];
                $boxes[$i]["used"] = true;
             }
-            elseif ((!strcasecmp($sent_folder, $boxes[$i]["unformatted"]) ||
-                !strcasecmp($sent_folder . $dm, $boxes[$i]["unformatted"] )
-               && ($move_to_sent)) {        
+            elseif (! (strcasecmp($sent_folder, $boxes[$i]["unformatted"]) &&
+                strcasecmp($sent_folder . $dm, $boxes[$i]["unformatted"] ))
+               && $move_to_sent) {        
                $boxesnew[] = $boxes[$i];
                $boxes[$i]["used"] = true;
             }