Changeset 4903 for contrib/z-push/backend/imap.php

Timestamp:

08/04/11 17:54:22 (13 years ago)

Author:

thiagoaos

Message:

Ticket #2192 - Adicionado configuração para definir nome da pasta Trash.

File:

• contrib/z-push/backend/imap.php (modified) (2 diffs)

contrib/z-push/backend/imap.php

@@ -567 +567 @@
                 $lid = strtolower($id);
 
+                $trash_folder_name = 'inbox.trash';
+
+                if(defined("IMAP_TRASHFOLDER"))
+                        $trash_folder_name = strtolower(str_replace($this->_serverdelimiter, ".", IMAP_TRASHFOLDER));
+
+                $sent_folder_name = 'inbox.sent';
+
+                if(defined("IMAP_SENTFOLDER"))
+                        $sent_folder_name = strtolower(str_replace($this->_serverdelimiter, ".", IMAP_SENTFOLDER));
+
+                $folder->parentid =  (($fhir && count($fhir) > 1) ? $fhir[(count($fhir) - 2)] : "0");
+
                 if($lid == "inbox") {
                         $folder->parentid = "0"; // Root
@@ -573 +585 @@
                 }
                 // Zarafa IMAP-Gateway outputs
-                else if($lid == "drafts") {
-                        $folder->parentid = "0";
+                else if($lid == "drafts" || $lid == "inbox.drafts" || $lid == "inbox.rascunhos") {
                         $folder->displayname = "Drafts";
                         $folder->type = SYNC_FOLDER_TYPE_DRAFTS;
                 }
-                else if($lid == "trash") {
-                        $folder->parentid = "0";
-                        $folder->displayname = "Trash";
+                else if($lid == "trash" || $lid == $trash_folder_name) {
+                        $folder->displayname = (defined("IMAP_DISPLAYNAME_TRASHFOLDER") ? IMAP_DISPLAYNAME_TRASHFOLDER : "Trash");
                         $folder->type = SYNC_FOLDER_TYPE_WASTEBASKET;
                         $this->_wasteID = $id;
                 }
-                else if($lid == "sent" || $lid == "sent items" || $lid == IMAP_SENTFOLDER) {
-                        $folder->parentid = "0";
-                        $folder->displayname = "Sent";
+                else if($lid == "sent" || $lid == "sent items" || $lid == $sent_folder_name) {
+                        $folder->displayname = (defined("IMAP_DISPLAYNAME_SENTFOLDER") ? IMAP_DISPLAYNAME_SENTFOLDER : "Sent");
                         $folder->type = SYNC_FOLDER_TYPE_SENTMAIL;
                         $this->_sentID = $id;
                 }
-                // courier-imap outputs
-                else if($lid == "inbox.drafts") {
-                        $folder->parentid = $fhir[0];
-                        $folder->displayname = "Drafts";
-                        $folder->type = SYNC_FOLDER_TYPE_DRAFTS;
-                }
-                else if($lid == "inbox.trash") {
-                        $folder->parentid = $fhir[0];
-                        $folder->displayname = "Trash";
-                        $folder->type = SYNC_FOLDER_TYPE_WASTEBASKET;
-                        $this->_wasteID = $id;
-                }
-                else if($lid == "inbox.sent") {
-                        $folder->parentid = $fhir[0];
-                        $folder->displayname = "Sent";
-                        $folder->type = SYNC_FOLDER_TYPE_SENTMAIL;
-                        $this->_sentID = $id;
-                }
-
                 // define the rest as other-folders
                 else {