Changeset 6091 for sandbox/webservice/api/rest/mail/Mail.php

Timestamp:

05/03/12 17:02:56 (12 years ago)

Author:

asaikawa

Message:

Ticket #2507 - Adicionado recurso de limpar a pasta lixeira

File:

• sandbox/webservice/api/rest/mail/Mail.php (modified) (2 diffs)

sandbox/webservice/api/rest/mail/Mail.php

@@ -67 +67 @@
                         $this->imap = CreateObject("expressoMail1_2.imap_functions");
                         
-                        if($this->defaultFolders == null) {                             
-                                $sent = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']) ?
-                                        $this->imap->functions->getLang("Sent") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
-                                $spam = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']) ?
-                                        $this->imap->functions->getLang("Spam"): $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
-                                $drafts = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']) ?
-                                        $this->imap->functions->getLang("Drafts") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
-                                $trash = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']) ?
-                                        $this->imap->functions->getLang("Trash") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
-                                
+                        if($this->defaultFolders == null) {
+                                $sent   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']) ?
+                                                        $this->imap->functions->getLang("Sent") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
+                                $spam   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']) ?
+                                                        $this->imap->functions->getLang("Spam"): $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
+                                $drafts = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']) ?
+                                                        $this->imap->functions->getLang("Drafts") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
+                                $trash  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']) ?
+                                                        $this->imap->functions->getLang("Trash") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+
                                 $this->defaultFolders = array (
                                                 'INBOX' => 0,
@@ -82 +82 @@
                                                 'INBOX'.$this->imap->imap_delimiter.$sent   => 1,
                                                 'INBOX'.$this->imap->imap_delimiter.$drafts => 4,
-                                                'INBOX'.$this->imap->imap_delimiter.$trash   => 3
+                                                'INBOX'.$this->imap->imap_delimiter.$trash  => 3
                                         );                                      
                         }