Changeset 1824
- Timestamp:
- 12/14/09 12:05:47 (14 years ago)
- Location:
- trunk/expressoMail1_2/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r1817 r1824 1543 1543 $resultDefault = array(); 1544 1544 1545 $trash = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 1546 $drafts = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 1547 $spam = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 1548 $sent = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; 1545 $inbox = 'INBOX'; 1546 $trash = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 1547 $drafts = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 1548 $spam = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 1549 $sent = $inbox . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; 1549 1550 1550 1551 if (is_array($folders_list)) { … … 1586 1587 1587 1588 switch ($tmp_folder_id[1]) { 1588 case 'INBOX':1589 case 'INBOX/'.$trash:1590 case 'INBOX/'.$sent:1591 case 'INBOX/'.$drafts:1592 case 'INBOX/'.$spam:1589 case $inbox: 1590 case $sent: 1591 case $drafts: 1592 case $spam: 1593 case $trash: 1593 1594 $resultDefault[]=$result[$i]; 1594 1595 default: … … 1619 1620 1620 1621 switch ($resultDefault[$key]['folder_id']) { 1621 case 'INBOX':1622 case $inbox: 1622 1623 $resultDefault2[0] = $resultDefault[$key]; 1623 1624 break; 1624 case 'INBOX/'.$sent:1625 case $sent: 1625 1626 $resultDefault2[1] = $resultDefault[$key]; 1626 1627 break; 1627 case 'INBOX/'.$drafts:1628 case $drafts: 1628 1629 $resultDefault2[2] = $resultDefault[$key]; 1629 1630 break; 1630 case 'INBOX/'.$spam:1631 case $spam: 1631 1632 $resultDefault2[3] = $resultDefault[$key]; 1632 1633 break; 1633 case 'INBOX/'.$trash:1634 case $trash: 1634 1635 $resultDefault2[4] = $resultDefault[$key]; 1635 1636 break; -
trunk/expressoMail1_2/inc/hook_settings.inc.php
r1752 r1824 107 107 $default = Array( 108 108 'INBOX' => lang('INBOX'), 109 'INBOX /'.$trash => lang($trash),110 'INBOX /'.$drafts => lang($drafts),111 'INBOX /'.$spam => lang($spam),112 'INBOX /'.$sent => lang($sent)109 'INBOX' . $this->imap_delimiter . $sent => lang($sent) 110 'INBOX' . $this->imap_delimiter . $drafts => lang($drafts), 111 'INBOX' . $this->imap_delimiter . $spam => lang($spam), 112 'INBOX' . $this->imap_delimiter . $trash => lang($trash), 113 113 ); 114 114 }
Note: See TracChangeset
for help on using the changeset viewer.