Changeset 1824

Timestamp:

12/14/09 12:05:47 (14 years ago)

Author:

wmerlotto

Message:

Ticket #557 - Foi alterado o cyrus delimiter de hardcoded para dinâmico.

Location:

trunk/expressoMail1_2/inc

Files:

• class.imap_functions.inc.php (modified) (3 diffs)
• hook_settings.inc.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1543 +1543 @@
                 $resultDefault = array();
 
-                $trash = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
-                $drafts = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
-                $spam = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
-                $sent = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
+                $inbox = 'INBOX';
+                $trash = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+                $drafts = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
+                $spam = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
+                $sent = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
 
                 if (is_array($folders_list)) {
@@ -1586 +1587 @@
 
                                 switch ($tmp_folder_id[1]) {
-                                        case 'INBOX':
-                                        case 'INBOX/'.$trash:
-                                        case 'INBOX/'.$sent:
-                                        case 'INBOX/'.$drafts:
-                                        case 'INBOX/'.$spam:
+                                        case $inbox:
+                                        case $sent:
+                                        case $drafts:
+                                        case $spam:
+                                        case $trash:
                                                 $resultDefault[]=$result[$i];
                                         default:
@@ -1619 +1620 @@
 
                         switch ($resultDefault[$key]['folder_id']) {
-                                case 'INBOX': 
+                                case $inbox: 
                                         $resultDefault2[0] = $resultDefault[$key];
                                         break;
-                                case 'INBOX/'.$sent: 
+                                case $sent: 
                                         $resultDefault2[1] = $resultDefault[$key];
                                         break;
-                                case 'INBOX/'.$drafts: 
+                                case $drafts: 
                                         $resultDefault2[2] = $resultDefault[$key];
                                         break;
-                                case 'INBOX/'.$spam: 
+                                case $spam: 
                                         $resultDefault2[3] = $resultDefault[$key];
                                         break;
-                                case 'INBOX/'.$trash: 
+                                case $trash: 
                                         $resultDefault2[4] = $resultDefault[$key];
                                         break;

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -107 +107 @@
         $default = Array(
                 'INBOX' =>      lang('INBOX'), 
-                'INBOX/'.$trash => lang($trash),  
-                'INBOX/'.$drafts => lang($drafts),
-                'INBOX/'.$spam => lang($spam),
-                'INBOX/'.$sent => lang($sent)
+                'INBOX' . $this->imap_delimiter . $sent => lang($sent)
+                'INBOX' . $this->imap_delimiter . $drafts => lang($drafts),
+                'INBOX' . $this->imap_delimiter . $spam => lang($spam),
+                'INBOX' . $this->imap_delimiter . $trash => lang($trash),  
         );
 }