Changeset 6091

Timestamp:

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

Author:

asaikawa

Message:

Ticket #2507 - Adicionado recurso de limpar a pasta lixeira

Location:

sandbox/webservice/api

Files:

• config/Tonic.srv (modified) (1 diff)
• rest/core/Errors.php (modified) (2 diffs)
• rest/dispatch.php (modified) (1 diff)
• rest/mail/CleanTrashResource.php (added)
• rest/mail/Mail.php (modified) (2 diffs)

sandbox/webservice/api/config/Tonic.srv

@@ -14 +14 @@
 MessagesResource = /mail/MessagesResource.php
 
+[/Mail/CleanTrash]
+CleanTrashResource = /mail/CleanTrashResource.php
+
 [/Mail/SendSupportFeedback]
 SendSupportFeedbackResource = /mail/SendSupportFeedbackResource.php

sandbox/webservice/api/rest/core/Errors.php

@@ -30 +30 @@
         const CATALOG_MIN_ARGUMENT_SEARCH       = "1001";       
         const MAIL_NOT_SENT                                     = "1002";
+        const MAIL_TRASH_NOT_CLEANED            = "1003";
         
         static private $reservedErrors = array (                        
@@ -57 +58 @@
                 self::LOGIN_INVALID_LOGIN                       => "Bad login or password",
                 self::CATALOG_MIN_ARGUMENT_SEARCH       => "Your search argument must be longer than %1 characters.",
-                self::MAIL_NOT_SENT                                     => "Your mail could not be sent."
+                self::MAIL_NOT_SENT                                     => "Your mail could not be sent.",
+                self::MAIL_TRASH_NOT_CLEANED            => "Your trash folder could not be cleaned."
         );
                 

sandbox/webservice/api/rest/dispatch.php

@@ -16 +16 @@
 require_once("./mail/FoldersResource.php");
 require_once("./mail/MessagesResource.php");
+require_once("./mail/CleanTrashResource.php");
 require_once("./mail/SendSupportFeedbackResource.php");
 

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
                                         );                                      
                         }