From e6c7c3ca9381aa10f7147544cd93f6179d32f359 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 13 Mar 2007 18:53:26 -0400
Subject: [PATCH] Fixed bugs in rcube_db and rcube_imap classes
---
program/include/rcube_imap.inc | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 24 deletions(-)
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 4e17197..9f249d5 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -5,7 +5,7 @@
| program/include/rcube_imap.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2006, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -35,7 +35,7 @@
*
* @package RoundCube Webmail
* @author Thomas Bruederli <roundcube@gmail.com>
- * @version 1.34
+ * @version 1.36
* @link http://ilohamail.org
*/
class rcube_imap
@@ -60,6 +60,10 @@
var $msg_headers = array();
var $capabilities = array();
var $skip_deleted = FALSE;
+ var $search_set = NULL;
+ var $search_subject = '';
+ var $search_string = '';
+ var $search_charset = '';
var $debug_level = 1;
@@ -265,6 +269,36 @@
{
$this->page_size = (int)$size;
}
+
+
+ /**
+ * Save a set of message ids for future message listing methods
+ *
+ * @param array List of IMAP fields to search in
+ * @param string Search string
+ * @param array List of message ids or NULL if empty
+ */
+ function set_search_set($subject, $str=null, $msgs=null, $charset=null)
+ {
+ if (is_array($subject) && $str == null && $msgs == null)
+ list($subject, $str, $msgs, $charset) = $subject;
+ if ($msgs != null && !is_array($msgs))
+ $msgs = split(',', $msgs);
+
+ $this->search_subject = $subject;
+ $this->search_string = $str;
+ $this->search_set = is_array($msgs) ? $msgs : NULL;
+ $this->search_charset = $charset;
+ }
+
+
+ /**
+ * Return the saved search set as hash array
+ */
+ function get_search_set()
+ {
+ return array($this->search_subject, $this->search_string, $this->search_set, $this->search_charset);
+ }
/**
@@ -402,6 +436,10 @@
if (empty($mailbox))
$mailbox = $this->mailbox;
+
+ // count search set
+ if ($this->search_set && $mailbox == $this->mailbox && $mode == 'ALL')
+ return count($this->search_set);
$a_mailbox_cache = $this->get_cache('messagecount');
@@ -481,7 +519,11 @@
{
if (!strlen($mailbox))
return array();
-
+
+ // use saved message set
+ if ($this->search_set && $mailbox == $this->mailbox)
+ return $this->_list_header_set($mailbox, $this->search_set, $page, $sort_field, $sort_order);
+
if ($sort_field!=NULL)
$this->sort_field = $sort_field;
if ($sort_order!=NULL)
@@ -492,10 +534,10 @@
list($begin, $end) = $this->_get_message_range($max, $page);
- // mailbox is empty
+ // mailbox is empty
if ($begin >= $end)
return array();
-
+
$headers_sorted = FALSE;
$cache_key = $mailbox.'.msg';
$cache_status = $this->check_cache_status($mailbox, $cache_key);
@@ -614,14 +656,14 @@
$this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
// return empty array if no messages found
- if (!is_array($a_msg_headers) || empty($a_msg_headers))
- return array();
+ if (!is_array($a_msg_headers) || empty($a_msg_headers))
+ return array();
// if not already sorted
$a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);
- // only return the requested part of the set
- return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
+ // only return the requested part of the set
+ return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
}
@@ -830,7 +872,20 @@
function search($mbox_name='', $criteria='ALL', $str=NULL, $charset=NULL)
{
$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
- if ($str && $criteria)
+
+ // have an array of criterias => execute multiple searches
+ if (is_array($criteria) && $str)
+ {
+ $results = array();
+ foreach ($criteria as $crit)
+ if ($search_result = $this->search($mbox_name, $crit, $str, $charset))
+ $results = array_merge($results, $search_result);
+
+ $results = array_unique($results);
+ $this->set_search_set($criteria, $str, $results, $charset);
+ return $results;
+ }
+ else if ($str && $criteria)
{
$search = (!empty($charset) ? "CHARSET $charset " : '') . sprintf("%s {%d}\r\n%s", $criteria, strlen($str), $str);
$results = $this->_search_index($mailbox, $search);
@@ -839,6 +894,7 @@
if (empty($results) && !empty($charset) && $charset!='ISO-8859-1')
$results = $this->search($mbox_name, $criteria, rcube_charset_convert($str, $charset, 'ISO-8859-1'), 'ISO-8859-1');
+ $this->set_search_set($criteria, $str, $results, $charset);
return $results;
}
else
@@ -865,6 +921,18 @@
}
return $a_messages;
+ }
+
+
+ /**
+ * Refresh saved search set
+ */
+ function refresh_search()
+ {
+ if (!empty($this->search_subject) && !empty($this->search_string))
+ $this->search_set = $this->search('', $this->search_subject, $this->search_string, $this->search_charset);
+
+ return $this->get_search_set();
}
@@ -1010,10 +1078,11 @@
// get part size
if (!empty($part[6]) && $part[6]!='NIL')
$struct->size = intval($part[6]);
-
+
// read part disposition
$di = count($part) - 2;
- if (is_array($part[$di]))
+ if ((is_array($part[$di]) && count($part[$di]) == 2 && is_array($part[$di][1])) ||
+ (is_array($part[--$di]) && count($part[$di]) == 2))
{
$struct->disposition = strtolower($part[$di][0]);
@@ -1053,7 +1122,7 @@
/**
- * Return a flat array with references to all parts, indexed by part numbmers
+ * Return a flat array with references to all parts, indexed by part numbers
*
* @param object Message body structure
* @return Array with part number -> object pairs
@@ -1302,6 +1371,10 @@
$this->_clear_messagecount($from_mbox);
$this->_clear_messagecount($to_mbox);
}
+
+ // remove message ids from search set
+ if ($moved && $this->search_set && $from_mbox == $this->mailbox)
+ $this->search_set = array_diff($this->search_set, $a_mids);
// update cached message headers
$cache_key = $from_mbox.'.msg';
@@ -1310,8 +1383,8 @@
$start_index = 100000;
foreach ($a_uids as $uid)
{
- if(($index = array_search($uid, $a_cache_index)) !== FALSE)
- $start_index = min($index, $start_index);
+ if (($index = array_search($uid, $a_cache_index)) !== FALSE)
+ $start_index = min($index, $start_index);
}
// clear cache from the lowest index on
@@ -1351,6 +1424,10 @@
$this->_clear_messagecount($mailbox);
}
+ // remove message ids from search set
+ if ($moved && $this->search_set && $mailbox == $this->mailbox)
+ $this->search_set = array_diff($this->search_set, $a_mids);
+
// remove deleted messages from cache
$cache_key = $mailbox.'.msg';
if ($deleted && ($a_cache_index = $this->get_message_cache_index($cache_key)))
@@ -1358,8 +1435,8 @@
$start_index = 100000;
foreach ($a_uids as $uid)
{
- $index = array_search($uid, $a_cache_index);
- $start_index = min($index, $start_index);
+ if (($index = array_search($uid, $a_cache_index)) !== FALSE)
+ $start_index = min($index, $start_index);
}
// clear cache from the lowest index on
@@ -1463,12 +1540,8 @@
function get_quota()
{
if ($this->get_capability('QUOTA'))
- {
- $result = iil_C_GetQuota($this->conn);
- if ($result["total"])
- return sprintf("%.2fMB / %.2fMB (%.0f%%)", $result["used"] / 1000.0, $result["total"] / 1000.0, $result["percent"]);
- }
-
+ return iil_C_GetQuota($this->conn);
+
return FALSE;
}
@@ -2380,7 +2453,8 @@
function _parse_address_list($str)
{
- $a = $this->_explode_quoted_string(',', $str);
+ // remove any newlines and carriage returns before
+ $a = $this->_explode_quoted_string(',', preg_replace( "/[\r\n]/", " ", $str));
$result = array();
foreach ($a as $key => $val)
--
Gitblit v1.9.1