From 7c9d922b96f9a88b350d6e07f5bde84ccc40f9b0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 02 Mar 2010 16:27:53 -0500
Subject: [PATCH] New recent check based on UIDs
---
program/include/rcube_imap.php | 175 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 116 insertions(+), 59 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 7c8a262..c9d2454 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -56,7 +56,6 @@
var $default_charset = 'ISO-8859-1';
var $struct_charset = NULL;
var $default_folders = array('INBOX');
- var $default_folders_lc = array('inbox');
var $fetch_add_headers = '';
var $cache = array();
var $cache_keys = array();
@@ -105,8 +104,9 @@
if ($use_ssl && extension_loaded('openssl'))
$ICL_SSL = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
else if ($use_ssl) {
- raise_error(array('code' => 403, 'type' => 'imap', 'file' => __FILE__,
- 'message' => 'Open SSL not available;'), TRUE, FALSE);
+ raise_error(array('code' => 403, 'type' => 'imap',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Open SSL not available"), TRUE, FALSE);
$port = 143;
}
@@ -136,9 +136,9 @@
else if (!$this->conn && $GLOBALS['iil_error'])
{
$this->error_code = $GLOBALS['iil_errornum'];
- raise_error(array('code' => 403,
- 'type' => 'imap',
- 'message' => $GLOBALS['iil_error']), TRUE, FALSE);
+ raise_error(array('code' => 403, 'type' => 'imap',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => $GLOBALS['iil_error']), TRUE, FALSE);
}
// get server properties
@@ -241,15 +241,10 @@
if (is_array($arr))
{
$this->default_folders = $arr;
- $this->default_folders_lc = array();
// add inbox if not included
if (!in_array_nocase('INBOX', $this->default_folders))
array_unshift($this->default_folders, 'INBOX');
-
- // create a second list with lower cased names
- foreach ($this->default_folders as $mbox)
- $this->default_folders_lc[] = strtolower($mbox);
}
}
@@ -500,6 +495,9 @@
if (!$force && is_array($a_mailbox_cache[$mailbox]) && isset($a_mailbox_cache[$mailbox][$mode]))
return $a_mailbox_cache[$mailbox][$mode];
+ if (!is_array($a_mailbox_cache[$mailbox]))
+ $a_mailbox_cache[$mailbox] = array();
+
// RECENT count is fetched a bit different
if ($mode == 'RECENT')
$count = iil_C_CheckForRecent($this->conn, $mailbox);
@@ -518,17 +516,15 @@
$index = $this->_search_index($mailbox, $search_str);
$count = is_array($index) ? count($index) : 0;
}
- else
- {
+ else {
if ($mode == 'UNSEEN')
$count = iil_C_CountUnseen($this->conn, $mailbox);
- else
+ else {
$count = iil_C_CountMessages($this->conn, $mailbox);
+ $_SESSION['maxuid'][$mailbox] = $count ? $this->_id2uid($count) : 0;
}
+ }
- if (!is_array($a_mailbox_cache[$mailbox]))
- $a_mailbox_cache[$mailbox] = array();
-
$a_mailbox_cache[$mailbox][$mode] = (int)$count;
// write back to cache
@@ -868,7 +864,31 @@
return count($a_msg_headers);
}
+
+ /**
+ * Fetches IDS of pseudo recent messages.
+ *
+ * We compare the maximum UID to determine the number of
+ * new messages because the RECENT flag is not reliable.
+ *
+ * @param string Mailbox/folder name
+ * @return array List of recent message UIDs
+ */
+ function recent_uids($mbox_name = null, $nofetch = false)
+ {
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+ $old_maxuid = intval($_SESSION['maxuid'][$mailbox]);
+ // refresh message count -> will update $_SESSION['maxuid'][$mailbox]
+ $this->messagecount($mbox_name, 'ALL', true);
+
+ if ($_SESSION['maxuid'][$mailbox] > $old_maxuid) {
+ $maxuid = max(1, $old_maxuid+1);
+ return array_values((array)iil_C_FetchHeaderIndex($this->conn, $mailbox, "$maxuid:*", 'UID', $this->skip_deleted, true));
+ }
+
+ return array();
+ }
/**
* Return sorted array of message IDs (not UIDs)
@@ -1258,7 +1278,7 @@
*
* @access private
*/
- function &_structure_part($part, $count=0, $parent='', $raw_headers=null)
+ function &_structure_part($part, $count=0, $parent='', $mime_headers=null, $raw_headers=null)
{
$struct = new rcube_message_part;
$struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";
@@ -1280,28 +1300,43 @@
// build parts list for headers pre-fetching
for ($i=0, $count=0; $i<count($part); $i++)
- if (is_array($part[$i]) && count($part[$i]) > 3)
- // fetch message headers if message/rfc822 or named part (could contain Content-Location header)
- if (strtolower($part[$i][0]) == 'message' ||
- (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) || $part[$i][3]=='NIL'))) {
- $part_headers[] = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
- }
-
+ if (is_array($part[$i]) && count($part[$i]) > 3) {
+ // fetch message headers if message/rfc822 or named part (could contain Content-Location header)
+ if (!is_array($part[$i][0])) {
+ $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
+ if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
+ $raw_part_headers[] = $tmp_part_id;
+ $mime_part_headers[] = $tmp_part_id;
+ }
+ else if (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) || $part[$i][3]=='NIL')) {
+ $mime_part_headers[] = $tmp_part_id;
+ }
+ }
+ }
+
// pre-fetch headers of all parts (in one command for better performance)
- if ($part_headers)
- $part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox, $this->_msg_id, $part_headers);
+ // @TODO: we could do this before _structure_part() call, to fetch
+ // headers for parts on all levels
+ if ($mime_part_headers)
+ $mime_part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox,
+ $this->_msg_id, $mime_part_headers);
+ // we'll need a real content-type of message/rfc822 part
+ if ($raw_part_headers)
+ $raw_part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox,
+ $this->_msg_id, $raw_part_headers, false);
$struct->parts = array();
for ($i=0, $count=0; $i<count($part); $i++)
if (is_array($part[$i]) && count($part[$i]) > 3) {
+ $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id,
- $part_headers[$struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1]);
+ $mime_part_headers[$tmp_part_id], $raw_part_headers[$tmp_part_id]);
}
return $struct;
}
-
-
+
+
// regular part
$struct->ctype_primary = strtolower($part[0]);
$struct->ctype_secondary = strtolower($part[1]);
@@ -1362,18 +1397,30 @@
// fetch message headers if message/rfc822 or named part (could contain Content-Location header)
if ($struct->ctype_primary == 'message' || ($struct->ctype_parameters['name'] && !$struct->content_id)) {
- if (empty($raw_headers))
- $raw_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $struct->mime_id);
- $struct->headers = $this->_parse_headers($raw_headers) + $struct->headers;
- }
+ if (empty($mime_headers))
+ $mime_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $struct->mime_id);
+ $struct->headers = $this->_parse_headers($mime_headers) + $struct->headers;
+
+ // get real headers for message of type 'message/rfc822'
+ if ($struct->mimetype == 'message/rfc822') {
+ if (empty($raw_headers))
+ $raw_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox, $this->_msg_id, (array)$struct->mime_id, false);
+ $struct->real_headers = $this->_parse_headers($raw_headers);
+
+ // get real content-type of message/rfc822
+ if (preg_match('/^([a-z0-9_\/-]+)/i', $struct->real_headers['content-type'], $matches)) {
+ $struct->real_mimetype = strtolower($matches[1]);
+ }
+ }
+ }
if ($struct->ctype_primary=='message') {
- if (is_array($part[8]) && empty($struct->parts))
+ if (is_array($part[8]) && $di != 8 && empty($struct->parts))
$struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id);
- }
+ }
// normalize filename property
- $this->_set_part_filename($struct, $raw_headers);
+ $this->_set_part_filename($struct, $mime_headers);
return $struct;
}
@@ -1671,17 +1718,27 @@
/**
* Append a mail message (source) to a specific mailbox
*
- * @param string Target mailbox
- * @param string Message source
+ * @param string Target mailbox
+ * @param string The message source string or filename
+ * @param string Headers string if $message contains only the body
+ * @param boolean True if $message is a filename
+ *
* @return boolean True on success, False on error
*/
- function save_message($mbox_name, &$message)
+ function save_message($mbox_name, &$message, $headers='', $is_file=false)
{
$mailbox = $this->mod_mailbox($mbox_name);
// make sure mailbox exists
- if (($mailbox == 'INBOX') || in_array($mailbox, $this->_list_mailboxes()))
- $saved = iil_C_Append($this->conn, $mailbox, $message);
+ if (($mailbox == 'INBOX') || in_array($mailbox, $this->_list_mailboxes())) {
+ if ($is_file) {
+ $separator = rcmail::get_instance()->config->header_delimiter();
+ $saved = iil_C_AppendFromFile($this->conn, $mailbox, $message,
+ $headers, $separator.$separator);
+ }
+ else
+ $saved = iil_C_Append($this->conn, $mailbox, $message);
+ }
if ($saved)
{
@@ -2118,9 +2175,9 @@
foreach ($this->default_folders as $folder)
{
$abs_name = $this->mod_mailbox($folder);
- if (!in_array_nocase($abs_name, $a_folders))
+ if (!in_array($abs_name, $a_folders))
$this->create_mailbox($folder, TRUE);
- else if (!in_array_nocase($abs_name, $a_subscribed))
+ else if (!in_array($abs_name, $a_subscribed))
$this->subscribe($folder);
}
}
@@ -2866,11 +2923,13 @@
if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
return $mbox_name;
- if (!empty($this->root_dir) && $mode=='in')
- $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
- else if (strlen($this->root_dir) && $mode=='out')
- $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
-
+ if (!empty($this->root_dir)) {
+ if ($mode=='in')
+ $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
+ else if (!empty($mbox_name)) // $mode=='out'
+ $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
+ }
+
return $mbox_name;
}
@@ -2907,7 +2966,7 @@
if ($folder{0}=='.')
continue;
- if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
+ if (($p = array_search($folder, $this->default_folders)) !== false && !$a_defaults[$p])
$a_defaults[$p] = $folder;
else
$folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF7-IMAP'));
@@ -2971,15 +3030,12 @@
{
if (!$mbox_name)
$mbox_name = $this->mailbox;
-
- $index = array_flip((array)$this->uid_id_map[$mbox_name]);
- if (isset($index[$id]))
- $uid = $index[$id];
- else
- {
- $uid = iil_C_ID2UID($this->conn, $mbox_name, $id);
- $this->uid_id_map[$mbox_name][$uid] = $id;
- }
+
+ if ($uid = array_search($id, (array)$this->uid_id_map[$mbox_name]))
+ return $uid;
+
+ $uid = iil_C_ID2UID($this->conn, $mbox_name, $id);
+ $this->uid_id_map[$mbox_name][$uid] = $id;
return $uid;
}
@@ -3081,6 +3137,7 @@
private function _parse_headers($headers)
{
$a_headers = array();
+ $headers = preg_replace('/\r?\n(\t| )+/', ' ', $headers);
$lines = explode("\n", $headers);
$c = count($lines);
for ($i=0; $i<$c; $i++)
--
Gitblit v1.9.1