Changeset 6091 for sandbox/webservice/api
- Timestamp:
- 05/03/12 17:02:56 (12 years ago)
- Location:
- sandbox/webservice/api
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/webservice/api/config/Tonic.srv
r6084 r6091 14 14 MessagesResource = /mail/MessagesResource.php 15 15 16 [/Mail/CleanTrash] 17 CleanTrashResource = /mail/CleanTrashResource.php 18 16 19 [/Mail/SendSupportFeedback] 17 20 SendSupportFeedbackResource = /mail/SendSupportFeedbackResource.php -
sandbox/webservice/api/rest/core/Errors.php
r6084 r6091 30 30 const CATALOG_MIN_ARGUMENT_SEARCH = "1001"; 31 31 const MAIL_NOT_SENT = "1002"; 32 const MAIL_TRASH_NOT_CLEANED = "1003"; 32 33 33 34 static private $reservedErrors = array ( … … 57 58 self::LOGIN_INVALID_LOGIN => "Bad login or password", 58 59 self::CATALOG_MIN_ARGUMENT_SEARCH => "Your search argument must be longer than %1 characters.", 59 self::MAIL_NOT_SENT => "Your mail could not be sent." 60 self::MAIL_NOT_SENT => "Your mail could not be sent.", 61 self::MAIL_TRASH_NOT_CLEANED => "Your trash folder could not be cleaned." 60 62 ); 61 63 -
sandbox/webservice/api/rest/dispatch.php
r6084 r6091 16 16 require_once("./mail/FoldersResource.php"); 17 17 require_once("./mail/MessagesResource.php"); 18 require_once("./mail/CleanTrashResource.php"); 18 19 require_once("./mail/SendSupportFeedbackResource.php"); 19 20 -
sandbox/webservice/api/rest/mail/Mail.php
r6019 r6091 67 67 $this->imap = CreateObject("expressoMail1_2.imap_functions"); 68 68 69 if($this->defaultFolders == null) { 70 $sent = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']) ?71 $this->imap->functions->getLang("Sent") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];72 $spam = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'])?73 $this->imap->functions->getLang("Spam"): $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];74 $drafts = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']) ?75 $this->imap->functions->getLang("Drafts") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];76 $trash = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']) ?77 $this->imap->functions->getLang("Trash") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];78 69 if($this->defaultFolders == null) { 70 $sent = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']) ? 71 $this->imap->functions->getLang("Sent") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; 72 $spam = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']) ? 73 $this->imap->functions->getLang("Spam"): $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 74 $drafts = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']) ? 75 $this->imap->functions->getLang("Drafts") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 76 $trash = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'] = empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']) ? 77 $this->imap->functions->getLang("Trash") : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 78 79 79 $this->defaultFolders = array ( 80 80 'INBOX' => 0, … … 82 82 'INBOX'.$this->imap->imap_delimiter.$sent => 1, 83 83 'INBOX'.$this->imap->imap_delimiter.$drafts => 4, 84 'INBOX'.$this->imap->imap_delimiter.$trash 84 'INBOX'.$this->imap->imap_delimiter.$trash => 3 85 85 ); 86 86 }
Note: See TracChangeset
for help on using the changeset viewer.