From 11ef977d13ce87390074591b1dded0796ffeefcd Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Tue, 02 Sep 2008 08:29:31 -0400 Subject: [PATCH] - fixed and re-enabled (RFC3501 [7.1]) CAPABILITY optional response use --- program/include/rcube_imap.php | 36 +----------------------------------- 1 files changed, 1 insertions(+), 35 deletions(-) diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 922b15e..0323c53 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -59,7 +59,6 @@ var $cache_changes = array(); var $uid_id_map = array(); var $msg_headers = array(); - var $capabilities = array(); var $skip_deleted = FALSE; var $search_set = NULL; var $search_subject = ''; @@ -131,8 +130,6 @@ // get server properties if ($this->conn) { - $this->_parse_capability($this->conn->capability); - if (!empty($this->conn->delimiter)) $this->delimiter = $this->conn->delimiter; if (!empty($this->conn->rootdir)) @@ -329,8 +326,7 @@ */ function get_capability($cap) { - $cap = strtoupper($cap); - return $this->capabilities[$cap]; + return iil_C_GetCapability($this->conn, strtoupper($cap)); } @@ -2578,36 +2574,6 @@ } return $uid; - } - - - /** - * Parse string or array of server capabilities and put them in internal array - * @access private - */ - function _parse_capability($caps) - { - if (!is_array($caps)) - $cap_arr = explode(' ', $caps); - else - $cap_arr = $caps; - - foreach ($cap_arr as $cap) - { - if ($cap=='CAPABILITY') - continue; - - if (strpos($cap, '=')>0) - { - list($key, $value) = explode('=', $cap); - if (!is_array($this->capabilities[$key])) - $this->capabilities[$key] = array(); - - $this->capabilities[$key][] = $value; - } - else - $this->capabilities[$cap] = TRUE; - } } -- Gitblit v1.9.1