Changeset 8085 for branches

Timestamp:

04/09/13 18:23:19 (11 years ago)

Author:

douglas

Message:

Ticket #3420 - Impossibilidade de remover mensagens em grande quantidade

Location:

branches/2.5/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/main.js (modified) (1 diff)

branches/2.5/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -4535 +4535 @@
                     {
                         $folder = str_replace($serverString, "", imap_utf7_decode($val->name));
-                        //$folder = str_replace("&-", "&", $folder);
-                                        $folder = imap_utf7_encode($folder);
-                        imap_setacl ($mbox_stream, $folder, "$user", $value['acls']);
-
+                        //$folder = str_replace("&-", "&", $folder);                     
+                        $trashFolder = explode($this->imap_delimiter,$folder); 
+                        $acls = ($trashFolder[count($trashFolder) - 1] == "Trash") ? $value['acls']."i" : $value['acls']; 
+                        $folder = imap_utf7_encode($folder);                     
+                        imap_setacl ($mbox_stream, $folder, "$user", $acls); 
                     }
                 }

branches/2.5/expressoMail1_2/js/main.js

@@ -1009 +1009 @@
                                         var arrayFolder = folder.split(cyrus_delimiter); 
                                         userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'];
-                                        //var has_folder = Folder.get( userTrashFolder, false ); 
+                                        var has_folder = false;//Folder.get( userTrashFolder, false ); 
                                         var folders = DataLayer.get("folder"); 
                                         $.each(folders,function(index,value){