From 5c460201f0a9107135be8963a90b7e8485c2659e Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 27 Feb 2014 16:07:14 +0000 Subject: [PATCH] skip querying imap-server for SPECIAL-USE Folders on openConnection as we assume our wizard already detected the folders correctly --- mail/inc/class.mail_bo.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php index 72744ac4ad..169ba48791 100644 --- a/mail/inc/class.mail_bo.inc.php +++ b/mail/inc/class.mail_bo.inc.php @@ -883,7 +883,8 @@ class mail_bo //error_log(__METHOD__.__LINE__); try { - $ret = $this->icServer->getSpecialUseFolders(); + // do not query IMAP Server for SPECIAL-USE Folders, as we assume thev wizard already did that + $ret = null;//$this->icServer->getSpecialUseFolders(); } catch (Exception $e) { $ret=null; @@ -891,6 +892,10 @@ class mail_bo if (empty($ret)) { $_specialUseFolders[$this->icServer->ImapServerId]=array(); + if (!empty($this->icServer->acc_folder_trash)) $_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_trash]='Trash'; + if (!empty($this->icServer->acc_folder_drafts)) $_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_draft]='Drafts'; + if (!empty($this->icServer->acc_folder_sent)) $_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_sent]='Sent'; + if (!empty($this->icServer->acc_folder_templates)) $_specialUseFolders[$this->icServer->ImapServerId][$this->icServer->acc_folder_template]='Templates'; } else {