From e5151adb936d48a517868f48c9ed45ab31423768 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 18 Jul 2013 09:03:44 +0000 Subject: [PATCH] add retrieved capabilities for keyword to status search --- mail/inc/class.mail_ui.inc.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 3b171d20de..2593238d54 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -216,6 +216,18 @@ class mail_ui if ($this->mail_bo->folderExists($sessionFolder)) { $content['nm']['selectedFolder'] = $this->mail_bo->profileID.self::$delimiter.$this->mail_bo->sessionData['maibox']; + $this->mail_bo->reopen($sessionFolder); // needed to fetch full set of capabilities + } + // since we are connected,(and selected the folder) we check for capabilities SUPPORTS_KEYWORDS to eventually add the keyword filters + if ($this->mail_bo->icServer->_connected == 1 && $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS')) + { + $this->statusTypes = array_merge($this->statusTypes,array( + 'keyword1' => 'urgent', + 'keyword2' => 'job', + 'keyword3' => 'personal', + 'keyword4' => 'to do', + 'keyword5' => 'later', + )); } if (!isset($content['nm']['foldertree'])) $content['nm']['foldertree'] = $this->mail_bo->profileID.self::$delimiter.'INBOX'; @@ -313,7 +325,14 @@ class mail_ui if ($preferences->preferences['prefcontroltestconnection'] == 'reset') exit; echo "

".lang('IMAP Server')."

"; - if($imapServer->_connectionErrorObject) $eO = $imapServer->_connectionErrorObject; + if($imapServer->_connectionErrorObject) + { + $eO = $imapServer->_connectionErrorObject; + } + else + { + $this->mail_bo->reopen('INBOX'); + } unset($imapServer->_connectionErrorObject); $sieveServer = clone $imapServer; if (!empty($imapServer->adminPassword)) $imapServer->adminPassword='**********************';