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 | 121 +++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 69 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 74454ca..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 = '';
@@ -81,17 +80,6 @@
/**
- * PHP 4 object constructor
- *
- * @see rcube_imap::__construct
- */
- function rcube_imap($db_conn)
- {
- $this->__construct($db_conn);
- }
-
-
- /**
* Connect to an IMAP server
*
* @param string Host to connect
@@ -102,7 +90,7 @@
* @return boolean TRUE on success, FALSE on failure
* @access public
*/
- function connect($host, $user, $pass, $port=143, $use_ssl=null, $auth_type='check')
+ function connect($host, $user, $pass, $port=143, $use_ssl=null, $auth_type=null)
{
global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;
@@ -119,7 +107,7 @@
$ICL_PORT = $port;
$IMAP_USE_INTERNAL_DATE = false;
- $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type));
+ $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type ? $auth_type : 'check'));
$this->host = $host;
$this->user = $user;
$this->pass = $pass;
@@ -142,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))
@@ -340,8 +326,22 @@
*/
function get_capability($cap)
{
- $cap = strtoupper($cap);
- return $this->capabilities[$cap];
+ return iil_C_GetCapability($this->conn, strtoupper($cap));
+ }
+
+
+ /**
+ * Checks the PERMANENTFLAGS capability of the current mailbox
+ * and returns true if the given flag is supported by the IMAP server
+ *
+ * @param string Permanentflag name
+ * @return mixed True if this flag is supported
+ * @access public
+ */
+ function check_permflag($flag)
+ {
+ $flagsmap = $GLOBALS['IMAP_FLAGS'];
+ return (($imap_flag = $flagsmap[strtoupper($flag)]) && in_array_nocase($imap_flag, $this->conn->permanentflags));
}
@@ -1074,7 +1074,7 @@
$struct->ctype_primary = 'multipart';
// find first non-array entry
- for ($i=1; count($part); $i++)
+ for ($i=1; $i<count($part); $i++)
if (!is_array($part[$i]))
{
$struct->ctype_secondary = strtolower($part[$i]);
@@ -1085,7 +1085,7 @@
$struct->parts = array();
for ($i=0, $count=0; $i<count($part); $i++)
- if (is_array($part[$i]) && count($part[$i]) > 5)
+ if (is_array($part[$i]) && count($part[$i]) > 3)
$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id);
return $struct;
@@ -1159,10 +1159,13 @@
if (is_array($part[8]) && empty($struct->parts))
$struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id);
}
-
+
// normalize filename property
if ($filename_mime = $struct->d_parameters['filename'] ? $struct->d_parameters['filename'] : $struct->ctype_parameters['name'])
- $struct->filename = rcube_imap::decode_mime_string($filename_mime, $this->default_charset);
+ {
+ $struct->filename = rcube_imap::decode_mime_string($filename_mime,
+ $struct->charset ? $struct->charset : rc_detect_encoding($filename_mime, $this->default_charset));
+ }
else if ($filename_encoded = $struct->d_parameters['filename*'] ? $struct->d_parameters['filename*'] : $struct->ctype_parameters['name*'])
{
// decode filename according to RFC 2231, Section 4
@@ -1170,7 +1173,8 @@
$struct->filename = rcube_charset_convert(urldecode($filename_urlencoded), $filename_charset);
}
else if (!empty($struct->headers['content-description']))
- $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'], $this->default_charset);
+ $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'],
+ $struct->charset ? $struct->charset : rc_detect_encoding($struct->headers['content-description'],$this->default_charset));
return $struct;
}
@@ -1248,7 +1252,10 @@
*/
function &get_body($uid, $part=1)
{
- return $this->get_message_part($uid, $part);
+ $headers = $this->get_headers($uid);
+ return rcube_charset_convert(
+ $this->mime_decode($this->get_message_part($uid, $part), 'quoted-printable'),
+ $headers->charset ? $headers->charset : $this->default_charset);
}
@@ -1308,6 +1315,8 @@
$result = iil_C_Undelete($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
else if ($flag=='UNSEEN')
$result = iil_C_Unseen($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
+ else if ($flag=='UNFLAGGED')
+ $result = iil_C_UnFlag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), 'FLAGGED');
else
$result = iil_C_Flag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), $flag);
@@ -1412,9 +1421,13 @@
// send expunge command in order to have the moved message
// really deleted from the source mailbox
if ($moved) {
- $this->_expunge($from_mbox, FALSE);
- $this->_clear_messagecount($from_mbox);
- $this->_clear_messagecount($to_mbox);
+ // but only when flag_for_deletion is set to false
+ if (!rcmail::get_instance()->config->get('flag_for_deletion', false))
+ {
+ $this->_expunge($from_mbox, FALSE);
+ $this->_clear_messagecount($from_mbox);
+ $this->_clear_messagecount($to_mbox);
+ }
}
// moving failed
else if (rcmail::get_instance()->config->get('delete_always', false)) {
@@ -1463,7 +1476,6 @@
if (!is_array($a_uids))
return false;
-
// convert uids to message ids
$a_mids = array();
foreach ($a_uids as $uid)
@@ -1477,10 +1489,11 @@
{
$this->_expunge($mailbox, FALSE);
$this->_clear_messagecount($mailbox);
+ unset($this->uid_id_map[$mailbox]);
}
// remove message ids from search set
- if ($moved && $this->search_set && $mailbox == $this->mailbox)
+ if ($deleted && $this->search_set && $mailbox == $this->mailbox)
$this->search_set = array_diff($this->search_set, $a_mids);
// remove deleted messages from cache
@@ -2502,7 +2515,7 @@
if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
$a_defaults[$p] = $folder;
else
- $folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF-7'));
+ $folders[$folder] = rc_strtolower(rcube_charset_convert($folder, 'UTF-7'));
}
asort($folders, SORT_LOCALE_STRING);
@@ -2511,19 +2524,19 @@
$folders = array_merge($a_defaults, array_keys($folders));
// finally we must rebuild the list to move
- // subfolders of default folders to their place
+ // subfolders of default folders to their place...
+ // ...also do this for the rest of folders because
+ // asort() is not properly sorting case sensitive names
while (list($key, $folder) = each($folders)) {
$a_out[] = $folder;
unset($folders[$key]);
- if (in_array(strtolower($folder), $this->default_folders_lc)) {
- foreach ($folders as $idx => $f) {
- if (strpos($f, $folder.$delimiter) === 0) {
- $a_out[] = $f;
- unset($folders[$idx]);
- }
+ foreach ($folders as $idx => $f) {
+ if (strpos($f, $folder.$delimiter) === 0) {
+ $a_out[] = $f;
+ unset($folders[$idx]);
}
- reset($folders);
- }
+ }
+ reset($folders);
}
return $a_out;
@@ -2561,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