From 5f571eb1dba01a5f257c52978f30cd53d773d15c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 11 Jul 2009 16:29:34 -0400
Subject: [PATCH] - few fixes for last commits
---
program/include/rcube_imap.php | 422 +++++++++++++++++++++++++++-------------------------
1 files changed, 219 insertions(+), 203 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 7905894..c823834 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -118,7 +118,7 @@
$this->port = $port;
$this->ssl = $use_ssl;
- // print trace mesages
+ // print trace messages
if ($this->conn && ($this->debug_level & 8))
console($this->conn->message);
@@ -254,7 +254,7 @@
*/
function set_mailbox($new_mbox)
{
- $mailbox = $this->_mod_mailbox($new_mbox);
+ $mailbox = $this->mod_mailbox($new_mbox);
if ($this->mailbox == $mailbox)
return;
@@ -330,7 +330,7 @@
*/
function get_mailbox_name()
{
- return $this->conn ? $this->_mod_mailbox($this->mailbox, 'out') : '';
+ return $this->conn ? $this->mod_mailbox($this->mailbox, 'out') : '';
}
@@ -398,7 +398,7 @@
foreach ($a_mboxes as $mbox_row)
{
- $name = $this->_mod_mailbox($mbox_row, 'out');
+ $name = $this->mod_mailbox($mbox_row, 'out');
if (strlen($name))
$a_out[] = $name;
}
@@ -421,7 +421,7 @@
* @see rcube_imap::list_mailboxes()
* @access private
*/
- function _list_mailboxes($root='', $filter='*')
+ private function _list_mailboxes($root='', $filter='*')
{
$a_defaults = $a_out = array();
@@ -437,7 +437,7 @@
}
else{
// retrieve list of folders from IMAP server
- $a_folders = iil_C_ListSubscribed($this->conn, $this->_mod_mailbox($root), $filter);
+ $a_folders = iil_C_ListSubscribed($this->conn, $this->mod_mailbox($root), $filter);
}
@@ -462,7 +462,7 @@
*/
function messagecount($mbox_name='', $mode='ALL', $force=FALSE)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
return $this->_messagecount($mailbox, $mode, $force);
}
@@ -473,7 +473,7 @@
* @access private
* @see rcube_imap::messagecount()
*/
- function _messagecount($mailbox='', $mode='ALL', $force=FALSE)
+ private function _messagecount($mailbox='', $mode='ALL', $force=FALSE)
{
$a_mailbox_cache = FALSE;
$mode = strtoupper($mode);
@@ -537,13 +537,14 @@
* @param int Current page to list
* @param string Header field to sort by
* @param string Sort order [ASC|DESC]
+ * @param boolean Number of slice items to extract from result array
* @return array Indexed array with message header objects
* @access public
*/
- function list_headers($mbox_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL)
+ function list_headers($mbox_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
- return $this->_list_headers($mailbox, $page, $sort_field, $sort_order);
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+ return $this->_list_headers($mailbox, $page, $sort_field, $sort_order, false, $slice);
}
@@ -553,14 +554,14 @@
* @access private
* @see rcube_imap::list_headers
*/
- function _list_headers($mailbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $recursive=FALSE)
+ private function _list_headers($mailbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $recursive=FALSE, $slice=0)
{
if (!strlen($mailbox))
return array();
// use saved message set
if ($this->search_string && $mailbox == $this->mailbox)
- return $this->_list_header_set($mailbox, $page, $sort_field, $sort_order);
+ return $this->_list_header_set($mailbox, $page, $sort_field, $sort_order, $slice);
$this->_set_sort_order($sort_field, $sort_order);
@@ -573,13 +574,16 @@
{
$start_msg = ($page-1) * $this->page_size;
$a_msg_headers = $this->get_message_cache($cache_key, $start_msg, $start_msg+$this->page_size, $this->sort_field, $this->sort_order);
- return array_values($a_msg_headers);
+ $result = array_values($a_msg_headers);
+ if ($slice)
+ $result = array_slice($result, -$slice, $slice);
+ return $result;
}
// cache is dirty, sync it
else if ($this->caching_enabled && $cache_status==-1 && !$recursive)
{
$this->sync_header_index($mailbox);
- return $this->_list_headers($mailbox, $page, $this->sort_field, $this->sort_order, TRUE);
+ return $this->_list_headers($mailbox, $page, $this->sort_field, $this->sort_order, TRUE, $slice);
}
// retrieve headers from IMAP
@@ -590,6 +594,9 @@
list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
$max = max($msg_index);
$msg_index = array_slice($msg_index, $begin, $end-$begin);
+
+ if ($slice)
+ $msg_index = array_slice($msg_index, ($this->sort_order == 'DESC' ? 0 : -$slice), $slice);
// fetch reqested headers from server
$this->_fetch_headers($mailbox, join(',', $msg_index), $a_msg_headers, $cache_key);
@@ -606,6 +613,9 @@
$max = max($msg_index);
list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
$msg_index = array_slice($msg_index, $begin, $end-$begin);
+
+ if ($slice)
+ $msg_index = array_slice($msg_index, ($this->sort_order == 'DESC' ? 0 : -$slice), $slice);
// fetch reqested headers from server
$this->_fetch_headers($mailbox, join(",", $msg_index), $a_msg_headers, $cache_key);
@@ -641,11 +651,12 @@
* @param int Current page to list
* @param string Header field to sort by
* @param string Sort order [ASC|DESC]
+ * @param boolean Number of slice items to extract from result array
* @return array Indexed array with message header objects
* @access private
* @see rcube_imap::list_header_set()
*/
- function _list_header_set($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL)
+ private function _list_header_set($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
{
if (!strlen($mailbox) || empty($this->search_set))
return array();
@@ -676,6 +687,9 @@
// get messages uids for one page
$msgs = array_slice(array_values($msgs), $start_msg, min(count($msgs)-$start_msg, $this->page_size));
+ if ($slice)
+ $msgs = array_slice($msgs, -$slice, $slice);
+
// fetch headers
$this->_fetch_headers($mailbox, join(',',$msgs), $a_msg_headers, NULL);
@@ -692,6 +706,8 @@
$a_index = $this->message_index('', $this->sort_field, $this->sort_order);
// get messages uids for one page...
$msgs = array_slice($a_index, $start_msg, min($cnt-$start_msg, $this->page_size));
+ if ($slice)
+ $msgs = array_slice($msgs, -$slice, $slice);
// ...and fetch headers
$this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
@@ -717,7 +733,11 @@
$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($cnt-$start_msg, $this->page_size));
+ $a_msg_headers = array_slice(array_values($a_msg_headers), $start_msg, min($cnt-$start_msg, $this->page_size));
+ if ($slice)
+ $a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);
+
+ return $a_msg_headers;
}
}
}
@@ -731,7 +751,7 @@
* @return array array with two values: first index, last index
* @access private
*/
- function _get_message_range($max, $page)
+ private function _get_message_range($max, $page)
{
$start_msg = ($page-1) * $this->page_size;
@@ -770,16 +790,16 @@
* @return int Messages count
* @access private
*/
- function _fetch_headers($mailbox, $msgs, &$a_msg_headers, $cache_key)
+ private function _fetch_headers($mailbox, $msgs, &$a_msg_headers, $cache_key)
{
- // cache is incomplete
- $cache_index = $this->get_message_cache_index($cache_key);
-
// fetch reqested headers from server
- $a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs, false, $this->fetch_add_headers);
-
+ $a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs, false, false, $this->fetch_add_headers);
+
if (!empty($a_header_index))
{
+ // cache is incomplete
+ $cache_index = $this->get_message_cache_index($cache_key);
+
foreach ($a_header_index as $i => $headers)
{
/*
@@ -794,12 +814,13 @@
*/
// add message to cache
if ($this->caching_enabled && $cache_index[$headers->id] != $headers->uid)
- $this->add_message_cache($cache_key, $headers->id, $headers);
+ $this->add_message_cache($cache_key, $headers->id, $headers, NULL,
+ !in_array((string)$headers->uid, $cache_index, true));
$a_msg_headers[$headers->uid] = $headers;
}
}
-
+
return count($a_msg_headers);
}
@@ -816,7 +837,7 @@
{
$this->_set_sort_order($sort_field, $sort_order);
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
$key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.msgi";
// we have a saved search result. get index from there
@@ -863,7 +884,6 @@
}
// fetch complete message index
- $msg_count = $this->_messagecount($mailbox);
if ($this->get_capability('sort') && ($a_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')))
{
if ($this->sort_order == 'DESC')
@@ -873,7 +893,7 @@
}
else
{
- $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:$msg_count", $this->sort_field, $this->skip_deleted);
+ $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", $this->sort_field, $this->skip_deleted);
if ($this->sort_order=="ASC")
asort($a_index);
@@ -913,31 +933,32 @@
// message in cache but in wrong position
if (in_array((string)$uid, $cache_index, TRUE))
{
- unset($cache_index[$id]);
+ unset($cache_index[$id]);
}
// other message at this position
if (isset($cache_index[$id]))
{
- $this->remove_message_cache($cache_key, $cache_index[$id]);
+ $for_remove[] = $cache_index[$id];
unset($cache_index[$id]);
}
- $toupdate[] = $id;
+ $for_update[] = $id;
}
- // fetch complete headers and add to cache
- if (!empty($toupdate)) {
- if ($headers = iil_C_FetchHeader($this->conn, $mailbox, join(',', $toupdate), false, $this->fetch_add_headers))
- foreach ($headers as $header)
- $this->add_message_cache($cache_key, $header->id, $header);
- }
+ // clear messages at wrong positions and those deleted that are still in cache_index
+ if (!empty($for_remove))
+ $cache_index = array_merge($cache_index, $for_remove);
- // those ids that are still in cache_index have been deleted
if (!empty($cache_index))
- {
- foreach ($cache_index as $id => $uid)
- $this->remove_message_cache($cache_key, $uid);
+ $this->remove_message_cache($cache_key, $cache_index);
+
+ // fetch complete headers and add to cache
+ if (!empty($for_update)) {
+ if ($headers = iil_C_FetchHeader($this->conn, $mailbox, join(',', $for_update), false, $this->fetch_add_headers))
+ foreach ($headers as $header)
+ $this->add_message_cache($cache_key, $header->id, $header, NULL,
+ in_array((string)$header->uid, (array)$for_remove, true));
}
}
@@ -957,7 +978,7 @@
if (!$str)
return false;
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
$results = $this->_search_index($mailbox, $str, $charset, $sort_field);
@@ -1000,7 +1021,7 @@
* @access private
* @see rcube_imap::search()
*/
- function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
+ private function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
{
$orig_criteria = $criteria;
@@ -1071,7 +1092,7 @@
*/
function get_headers($id, $mbox_name=NULL, $is_uid=TRUE, $bodystr=FALSE)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
$uid = $is_uid ? $id : $this->_id2uid($id);
// get cached headers
@@ -1086,7 +1107,7 @@
if ($headers->uid && $headers->id)
$this->uid_id_map[$mailbox][$headers->uid] = $headers->id;
- $this->add_message_cache($mailbox.'.msg', $headers->id, $headers);
+ $this->add_message_cache($mailbox.'.msg', $headers->id, $headers, NULL, true);
}
return $headers;
@@ -1104,28 +1125,23 @@
function &get_structure($uid, $structure_str='')
{
$cache_key = $this->mailbox.'.msg';
- $headers = &$this->get_cached_message($cache_key, $uid, true);
+ $headers = &$this->get_cached_message($cache_key, $uid);
// return cached message structure
if (is_object($headers) && is_object($headers->structure)) {
return $headers->structure;
}
- // resolve message sequence number
- if (!($msg_id = $this->_uid2id($uid))) {
- return FALSE;
- }
-
if (!$structure_str)
- $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
+ $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $uid, true);
$structure = iml_GetRawStructureArray($structure_str);
$struct = false;
// parse structure and add headers
if (!empty($structure))
{
- $this->_msg_id = $msg_id;
$headers = $this->get_headers($uid);
+ $this->_msg_id = $headers->id;
// set message charset from message headers
if ($headers->charset)
@@ -1146,7 +1162,7 @@
// write structure to cache
if ($this->caching_enabled)
- $this->add_message_cache($cache_key, $msg_id, $headers, $struct);
+ $this->add_message_cache($cache_key, $this->_msg_id, $headers, $struct);
}
return $struct;
@@ -1263,7 +1279,7 @@
// 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, $struct->mime_id);
+ $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;
}
@@ -1286,7 +1302,7 @@
* @param object rcube_message_part Part object
* @param string Part's raw headers
*/
- function _set_part_filename(&$part, $headers=null)
+ private function _set_part_filename(&$part, $headers=null)
{
if (!empty($part->d_parameters['filename']))
$filename_mime = $part->d_parameters['filename'];
@@ -1306,7 +1322,7 @@
// we must fetch and parse headers "manually"
if ($i<2) {
if (!$headers)
- $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
+ $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
$filename_mime = '';
$i = 0;
while (preg_match('/filename\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
@@ -1323,7 +1339,7 @@
}
if ($i<2) {
if (!$headers)
- $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
+ $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
$filename_encoded = '';
$i = 0; $matches = array();
while (preg_match('/filename\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
@@ -1340,7 +1356,7 @@
}
if ($i<2) {
if (!$headers)
- $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
+ $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
$filename_mime = '';
$i = 0; $matches = array();
while (preg_match('/\s+name\*'.$i.'\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
@@ -1357,7 +1373,7 @@
}
if ($i<2) {
if (!$headers)
- $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $part->mime_id);
+ $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
$filename_encoded = '';
$i = 0; $matches = array();
while (preg_match('/\s+name\*'.$i.'\*\s*=\s*"*([^"\n;]+)[";]*/', $headers, $matches)) {
@@ -1421,14 +1437,15 @@
*/
function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL)
{
- if (!($msg_id = $this->_uid2id($uid)))
- return FALSE;
-
// get part encoding if not provided
if (!is_object($o_part))
{
- $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
+ $structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $uid, true);
$structure = iml_GetRawStructureArray($structure_str);
+ // error or message not found
+ if (empty($structure))
+ return false;
+
$part_type = iml_GetPartTypeCode($structure, $part);
$o_part = new rcube_message_part;
$o_part->ctype_primary = $part_type==0 ? 'text' : ($part_type==2 ? 'message' : 'other');
@@ -1440,9 +1457,9 @@
if (!$part) $part = 'TEXT';
- $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part,
+ $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $uid, true, $part,
$o_part->encoding, $print, $fp);
-
+
if ($fp || $print)
return true;
@@ -1482,10 +1499,7 @@
*/
function &get_raw_body($uid)
{
- if (!($msg_id = $this->_uid2id($uid)))
- return FALSE;
-
- return iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id);
+ return iil_C_HandlePartBody($this->conn, $this->mailbox, $uid, true);
}
@@ -1497,12 +1511,7 @@
*/
function &get_raw_headers($uid)
{
- if (!($msg_id = $this->_uid2id($uid)))
- return FALSE;
-
- $headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $msg_id, NULL);
-
- return $headers;
+ return iil_C_FetchPartHeader($this->conn, $this->mailbox, $uid, true);
}
@@ -1513,10 +1522,7 @@
*/
function print_raw_body($uid)
{
- if (!($msg_id = $this->_uid2id($uid)))
- return FALSE;
-
- iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, NULL, NULL, true);
+ iil_C_HandlePartBody($this->conn, $this->mailbox, $uid, true, NULL, NULL, true);
}
@@ -1530,7 +1536,7 @@
*/
function set_flag($uids, $flag, $mbox_name=NULL)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
$flag = strtoupper($flag);
if (!is_array($uids))
@@ -1546,12 +1552,10 @@
$result = iil_C_Flag($this->conn, $mailbox, join(',', $uids), $flag);
// reload message headers if cached
- $cache_key = $mailbox.'.msg';
if ($this->caching_enabled)
{
- foreach ($uids as $uid)
- if ($cached_headers = $this->get_cached_message($cache_key, $uid))
- $this->remove_message_cache($cache_key, $uid);
+ $cache_key = $mailbox.'.msg';
+ $this->remove_message_cache($cache_key, $uids);
// close and re-open connection
// this prevents connection problems with Courier
@@ -1582,7 +1586,7 @@
*/
function save_message($mbox_name, &$message)
{
- $mailbox = $this->_mod_mailbox($mbox_name);
+ $mailbox = $this->mod_mailbox($mbox_name);
// make sure mailbox exists
if (($mailbox == 'INBOX') || in_array($mailbox, $this->_list_mailboxes()))
@@ -1608,8 +1612,8 @@
*/
function move_message($uids, $to_mbox, $from_mbox='')
{
- $to_mbox = $this->_mod_mailbox($to_mbox);
- $from_mbox = $from_mbox ? $this->_mod_mailbox($from_mbox) : $this->mailbox;
+ $to_mbox = $this->mod_mailbox($to_mbox);
+ $from_mbox = $from_mbox ? $this->mod_mailbox($from_mbox) : $this->mailbox;
// make sure mailbox exists
if ($to_mbox != 'INBOX' && !in_array($to_mbox, $this->_list_mailboxes()))
@@ -1650,15 +1654,7 @@
}
// update cached message headers
$cache_key = $from_mbox.'.msg';
- if ($moved && ($a_cache_index = $this->get_message_cache_index($cache_key)))
- {
- $start_index = 100000;
- foreach ($a_uids as $uid)
- {
- if (($index = array_search($uid, $a_cache_index)) !== FALSE)
- $start_index = min($index, $start_index);
- }
-
+ if ($moved && $start_index = $this->get_message_cache_index_min($cache_key, $a_uids)) {
// clear cache from the lowest index on
$this->clear_message_cache($cache_key, $start_index);
}
@@ -1676,7 +1672,7 @@
*/
function delete_message($uids, $mbox_name='')
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
// convert the list of uids to array
$a_uids = is_string($uids) ? explode(',', $uids) : (is_array($uids) ? $uids : NULL);
@@ -1705,15 +1701,7 @@
// remove deleted messages from cache
$cache_key = $mailbox.'.msg';
- if ($deleted && ($a_cache_index = $this->get_message_cache_index($cache_key)))
- {
- $start_index = 100000;
- foreach ($a_uids as $uid)
- {
- if (($index = array_search($uid, $a_cache_index)) !== FALSE)
- $start_index = min($index, $start_index);
- }
-
+ if ($deleted && $start_index = $this->get_message_cache_index_min($cache_key, $a_uids)) {
// clear cache from the lowest index on
$this->clear_message_cache($cache_key, $start_index);
}
@@ -1730,7 +1718,7 @@
*/
function clear_mailbox($mbox_name=NULL)
{
- $mailbox = !empty($mbox_name) ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = !empty($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
$msg_count = $this->_messagecount($mailbox, 'ALL');
if ($msg_count>0)
@@ -1762,7 +1750,7 @@
*/
function expunge($mbox_name='', $clear_cache=TRUE)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
return $this->_expunge($mailbox, $clear_cache);
}
@@ -1777,7 +1765,7 @@
* @return boolean True on success
* @access private
*/
- function _expunge($mailbox, $clear_cache=TRUE, $uids=NULL)
+ private function _expunge($mailbox, $clear_cache=TRUE, $uids=NULL)
{
if ($uids && $this->get_capability('UIDPLUS'))
$a_uids = is_array($uids) ? join(',', $uids) : $uids;
@@ -1815,12 +1803,12 @@
return $sa_unsubscribed;
// retrieve list of folders from IMAP server
- $a_mboxes = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox($root), '*');
+ $a_mboxes = iil_C_ListMailboxes($this->conn, $this->mod_mailbox($root), '*');
// modify names with root dir
foreach ($a_mboxes as $mbox_name)
{
- $name = $this->_mod_mailbox($mbox_name, 'out');
+ $name = $this->mod_mailbox($mbox_name, 'out');
if (strlen($name))
$a_folders[] = $name;
}
@@ -1892,7 +1880,7 @@
// reduce mailbox name to 100 chars
$name = substr($name, 0, 100);
- $abs_name = $this->_mod_mailbox($name);
+ $abs_name = $this->mod_mailbox($name);
$a_mailbox_cache = $this->get_cache('mailboxes');
if (strlen($abs_name) && (!is_array($a_mailbox_cache) || !in_array($abs_name, $a_mailbox_cache)))
@@ -1921,8 +1909,8 @@
$name = substr($new_name, 0, 100);
// make absolute path
- $mailbox = $this->_mod_mailbox($mbox_name);
- $abs_name = $this->_mod_mailbox($name);
+ $mailbox = $this->mod_mailbox($mbox_name);
+ $abs_name = $this->mod_mailbox($name);
// check if mailbox is subscribed
$a_subscribed = $this->_list_mailboxes();
@@ -1975,12 +1963,12 @@
else if (is_string($mbox_name) && strlen($mbox_name))
$a_mboxes = explode(',', $mbox_name);
- $all_mboxes = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox($root), '*');
+ $all_mboxes = iil_C_ListMailboxes($this->conn, $this->mod_mailbox($root), '*');
if (is_array($a_mboxes))
foreach ($a_mboxes as $mbox_name)
{
- $mailbox = $this->_mod_mailbox($mbox_name);
+ $mailbox = $this->mod_mailbox($mbox_name);
// unsubscribe mailbox before deleting
iil_C_UnSubscribe($this->conn, $mailbox);
@@ -2021,13 +2009,13 @@
*/
function create_default_folders()
{
- $a_folders = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox(''), '*');
- $a_subscribed = iil_C_ListSubscribed($this->conn, $this->_mod_mailbox(''), '*');
+ $a_folders = iil_C_ListMailboxes($this->conn, $this->mod_mailbox(''), '*');
+ $a_subscribed = iil_C_ListSubscribed($this->conn, $this->mod_mailbox(''), '*');
// create default folders if they do not exist
foreach ($this->default_folders as $folder)
{
- $abs_name = $this->_mod_mailbox($folder);
+ $abs_name = $this->mod_mailbox($folder);
if (!in_array_nocase($abs_name, $a_folders))
$this->create_mailbox($folder, TRUE);
else if (!in_array_nocase($abs_name, $a_subscribed))
@@ -2060,8 +2048,7 @@
// read cache
if (!isset($this->cache[$key]) && $this->caching_enabled)
{
- $cache_data = $this->_read_cache_record('IMAP.'.$key);
- $this->cache[$key] = strlen($cache_data) ? unserialize($cache_data) : FALSE;
+ return $this->_read_cache_record($key);
}
return $this->cache[$key];
@@ -2087,7 +2074,7 @@
foreach ($this->cache as $key => $data)
{
if ($this->cache_changes[$key])
- $this->_write_cache_record('IMAP.'.$key, serialize($data));
+ $this->_write_cache_record($key, serialize($data));
}
}
}
@@ -2103,7 +2090,7 @@
if ($key===NULL)
{
foreach ($this->cache as $key => $data)
- $this->_clear_cache_record('IMAP.'.$key);
+ $this->_clear_cache_record($key);
$this->cache = array();
$this->cache_changed = FALSE;
@@ -2111,7 +2098,7 @@
}
else
{
- $this->_clear_cache_record('IMAP.'.$key);
+ $this->_clear_cache_record($key);
$this->cache_changes[$key] = FALSE;
unset($this->cache[$key]);
}
@@ -2120,35 +2107,33 @@
/**
* @access private
*/
- function _read_cache_record($key)
+ private function _read_cache_record($key)
{
- $cache_data = FALSE;
-
if ($this->db)
{
// get cached data from DB
$sql_result = $this->db->query(
- "SELECT cache_id, data
+ "SELECT cache_id, data, cache_key
FROM ".get_table_name('cache')."
WHERE user_id=?
- AND cache_key=?",
- $_SESSION['user_id'],
- $key);
+ AND cache_key LIKE 'IMAP.%'",
+ $_SESSION['user_id']);
- if ($sql_arr = $this->db->fetch_assoc($sql_result))
+ while ($sql_arr = $this->db->fetch_assoc($sql_result))
{
- $cache_data = $sql_arr['data'];
- $this->cache_keys[$key] = $sql_arr['cache_id'];
+ $sql_key = preg_replace('/^IMAP\./', '', $sql_arr['cache_key']);
+ $this->cache_keys[$sql_key] = $sql_arr['cache_id'];
+ $this->cache[$sql_key] = $sql_arr['data'] ? unserialize($sql_arr['data']) : FALSE;
}
}
- return $cache_data;
+ return $this->cache[$key];
}
/**
* @access private
*/
- function _write_cache_record($key, $data)
+ private function _write_cache_record($key, $data)
{
if (!$this->db)
return FALSE;
@@ -2162,7 +2147,7 @@
WHERE user_id=?
AND cache_key=?",
$_SESSION['user_id'],
- $key);
+ 'IMAP.'.$key);
if ($sql_arr = $this->db->fetch_assoc($sql_result))
$this->cache_keys[$key] = $sql_arr['cache_id'];
@@ -2180,7 +2165,7 @@
AND cache_key=?",
$data,
$_SESSION['user_id'],
- $key);
+ 'IMAP.'.$key);
}
// add new cache record
else
@@ -2190,7 +2175,7 @@
(created, user_id, cache_key, data)
VALUES (".$this->db->now().", ?, ?, ?)",
$_SESSION['user_id'],
- $key,
+ 'IMAP.'.$key,
$data);
}
}
@@ -2198,14 +2183,14 @@
/**
* @access private
*/
- function _clear_cache_record($key)
+ private function _clear_cache_record($key)
{
$this->db->query(
"DELETE FROM ".get_table_name('cache')."
WHERE user_id=?
AND cache_key=?",
$_SESSION['user_id'],
- $key);
+ 'IMAP.'.$key);
}
@@ -2222,7 +2207,7 @@
* @param string Internal cache key
* @return int -3 = off, -2 = incomplete, -1 = dirty
*/
- function check_cache_status($mailbox, $cache_key)
+ private function check_cache_status($mailbox, $cache_key)
{
if (!$this->caching_enabled)
return -3;
@@ -2268,7 +2253,7 @@
/**
* @access private
*/
- function get_message_cache($key, $from, $to, $sort_field, $sort_order)
+ private function get_message_cache($key, $from, $to, $sort_field, $sort_order)
{
$cache_key = "$key:$from:$to:$sort_field:$sort_order";
$db_header_fields = array('idx', 'uid', 'subject', 'from', 'to', 'cc', 'date', 'size');
@@ -2284,8 +2269,7 @@
FROM ".get_table_name('messages')."
WHERE user_id=?
AND cache_key=?
- ORDER BY ".$this->db->quoteIdentifier($sort_field)." ".
- strtoupper($sort_order),
+ ORDER BY ".$this->db->quoteIdentifier($sort_field)." ".strtoupper($sort_order),
$from,
$to-$from,
$_SESSION['user_id'],
@@ -2294,30 +2278,28 @@
while ($sql_arr = $this->db->fetch_assoc($sql_result))
{
$uid = $sql_arr['uid'];
- $this->cache[$cache_key][$uid] = unserialize($sql_arr['headers']);
-
+ $this->cache[$cache_key][$uid] = $this->db->decode(unserialize($sql_arr['headers']));
+
// featch headers if unserialize failed
if (empty($this->cache[$cache_key][$uid]))
$this->cache[$cache_key][$uid] = iil_C_FetchHeader($this->conn, preg_replace('/.msg$/', '', $key), $uid, true, $this->fetch_add_headers);
}
}
-
+
return $this->cache[$cache_key];
}
/**
* @access private
*/
- function &get_cached_message($key, $uid, $struct=false)
+ private function &get_cached_message($key, $uid)
{
$internal_key = '__single_msg';
- if ($this->caching_enabled && (!isset($this->cache[$internal_key][$uid]) ||
- ($struct && empty($this->cache[$internal_key][$uid]->structure))))
+ if ($this->caching_enabled && !isset($this->cache[$internal_key][$uid]))
{
- $sql_select = "idx, uid, headers" . ($struct ? ", structure" : '');
$sql_result = $this->db->query(
- "SELECT $sql_select
+ "SELECT idx, headers, structure
FROM ".get_table_name('messages')."
WHERE user_id=?
AND cache_key=?
@@ -2328,9 +2310,10 @@
if ($sql_arr = $this->db->fetch_assoc($sql_result))
{
- $this->cache[$internal_key][$uid] = unserialize($sql_arr['headers']);
+ $this->uid_id_map[preg_replace('/\.msg$/', '', $key)][$uid] = $sql_arr['idx'];
+ $this->cache[$internal_key][$uid] = $this->db->decode(unserialize($sql_arr['headers']));
if (is_object($this->cache[$internal_key][$uid]) && !empty($sql_arr['structure']))
- $this->cache[$internal_key][$uid]->structure = unserialize($sql_arr['structure']);
+ $this->cache[$internal_key][$uid]->structure = $this->db->decode(unserialize($sql_arr['structure']));
}
}
@@ -2340,7 +2323,7 @@
/**
* @access private
*/
- function get_message_cache_index($key, $force=FALSE, $sort_field='idx', $sort_order='ASC')
+ private function get_message_cache_index($key, $force=FALSE, $sort_field='idx', $sort_order='ASC')
{
static $sa_message_index = array();
@@ -2370,21 +2353,22 @@
/**
* @access private
*/
- function add_message_cache($key, $index, $headers, $struct=null)
+ private function add_message_cache($key, $index, $headers, $struct=null, $force=false)
{
if (empty($key) || !is_object($headers) || empty($headers->uid))
return;
// add to internal (fast) cache
- $this->cache['__single_msg'][$headers->uid] = $headers;
+ $this->cache['__single_msg'][$headers->uid] = clone $headers;
$this->cache['__single_msg'][$headers->uid]->structure = $struct;
-
+
// no further caching
if (!$this->caching_enabled)
return;
// check for an existing record (probly headers are cached but structure not)
- $sql_result = $this->db->query(
+ if (!$force) {
+ $sql_result = $this->db->query(
"SELECT message_id
FROM ".get_table_name('messages')."
WHERE user_id=?
@@ -2394,18 +2378,21 @@
$_SESSION['user_id'],
$key,
$headers->uid);
+ if ($sql_arr = $this->db->fetch_assoc($sql_result))
+ $message_id = $sql_arr['message_id'];
+ }
// update cache record
- if ($sql_arr = $this->db->fetch_assoc($sql_result))
+ if ($message_id)
{
$this->db->query(
"UPDATE ".get_table_name('messages')."
SET idx=?, headers=?, structure=?
WHERE message_id=?",
$index,
- serialize($headers),
- is_object($struct) ? serialize($struct) : NULL,
- $sql_arr['message_id']
+ serialize($this->db->encode(clone $headers)),
+ is_object($struct) ? serialize($this->db->encode(clone $struct)) : NULL,
+ $message_id
);
}
else // insert new record
@@ -2418,13 +2405,13 @@
$key,
$index,
$headers->uid,
- (string)substr($this->decode_header($headers->subject, TRUE), 0, 128),
- (string)substr($this->decode_header($headers->from, TRUE), 0, 128),
- (string)substr($this->decode_header($headers->to, TRUE), 0, 128),
- (string)substr($this->decode_header($headers->cc, TRUE), 0, 128),
+ (string)rc_substr($this->db->encode($this->decode_header($headers->subject, TRUE)), 0, 128),
+ (string)rc_substr($this->db->encode($this->decode_header($headers->from, TRUE)), 0, 128),
+ (string)rc_substr($this->db->encode($this->decode_header($headers->to, TRUE)), 0, 128),
+ (string)rc_substr($this->db->encode($this->decode_header($headers->cc, TRUE)), 0, 128),
(int)$headers->size,
- serialize($headers),
- is_object($struct) ? serialize($struct) : NULL
+ serialize($this->db->encode(clone $headers)),
+ is_object($struct) ? serialize($this->db->encode(clone $struct)) : NULL
);
}
}
@@ -2432,25 +2419,24 @@
/**
* @access private
*/
- function remove_message_cache($key, $uid)
+ private function remove_message_cache($key, $uids)
{
if (!$this->caching_enabled)
return;
$this->db->query(
"DELETE FROM ".get_table_name('messages')."
- WHERE user_id=?
- AND cache_key=?
- AND uid=?",
+ WHERE user_id=?
+ AND cache_key=?
+ AND uid IN (".$this->db->array2list($uids, 'integer').")",
$_SESSION['user_id'],
- $key,
- $uid);
+ $key);
}
/**
* @access private
*/
- function clear_message_cache($key, $start_index=1)
+ private function clear_message_cache($key, $start_index=1)
{
if (!$this->caching_enabled)
return;
@@ -2465,7 +2451,28 @@
$start_index);
}
+ /**
+ * @access private
+ */
+ private function get_message_cache_index_min($key, $uids=NULL)
+ {
+ if (!$this->caching_enabled)
+ return;
+
+ $sql_result = $this->db->query(
+ "SELECT MIN(idx) AS minidx
+ FROM ".get_table_name('messages')."
+ WHERE user_id=?
+ AND cache_key=?"
+ .(!empty($uids) ? " AND uid IN (".$this->db->array2list($uids, 'integer').")" : ''),
+ $_SESSION['user_id'],
+ $key);
+ if ($sql_arr = $this->db->fetch_assoc($sql_result))
+ return $sql_arr['minidx'];
+ else
+ return 0;
+ }
/* --------------------------------
@@ -2629,7 +2636,7 @@
*
* @access private
*/
- function _decode_mime_string_part($str)
+ private function _decode_mime_string_part($str)
{
$a = explode('?', $str);
$count = count($a);
@@ -2661,7 +2668,6 @@
* @param string Input string
* @param string Part encoding
* @return string Decoded string
- * @access private
*/
function mime_decode($input, $encoding='7bit')
{
@@ -2690,7 +2696,7 @@
/**
- * Convert body charset to UTF-8 according to the ctype_parameters
+ * Convert body charset to RCMAIL_CHARSET according to the ctype_parameters
*
* @param string Part body to decode
* @param string Charset to convert from
@@ -2715,7 +2721,7 @@
*/
function get_id($uid, $mbox_name=NULL)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
return $this->_uid2id($uid, $mailbox);
}
@@ -2729,21 +2735,19 @@
*/
function get_uid($id,$mbox_name=NULL)
{
- $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
+ $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
return $this->_id2uid($id, $mailbox);
}
-
- /* --------------------------------
- * private methods
- * --------------------------------*/
-
-
/**
- * @access private
+ * Modify folder name for input/output according to root dir and namespace
+ *
+ * @param string Folder name
+ * @param string Mode
+ * @return string Folder name
*/
- function _mod_mailbox($mbox_name, $mode='in')
+ function mod_mailbox($mbox_name, $mode='in')
{
if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
return $mbox_name;
@@ -2756,11 +2760,16 @@
return $mbox_name;
}
+
+ /* --------------------------------
+ * private methods
+ * --------------------------------*/
+
/**
* Validate the given input and save to local properties
* @access private
*/
- function _set_sort_order($sort_field, $sort_order)
+ private function _set_sort_order($sort_field, $sort_order)
{
if ($sort_field != null)
$this->sort_field = asciiwords($sort_field);
@@ -2772,7 +2781,7 @@
* Sort mailboxes first by default folders and then in alphabethical order
* @access private
*/
- function _sort_mailbox_list($a_folders)
+ private function _sort_mailbox_list($a_folders)
{
$a_out = $a_defaults = $folders = array();
@@ -2813,7 +2822,7 @@
/**
* @access private
*/
- function _rsort($folder, $delimiter, &$list, &$out)
+ private function _rsort($folder, $delimiter, &$list, &$out)
{
while (list($key, $name) = each($list)) {
if (strpos($name, $folder.$delimiter) === 0) {
@@ -2830,7 +2839,7 @@
/**
* @access private
*/
- function _uid2id($uid, $mbox_name=NULL)
+ private function _uid2id($uid, $mbox_name=NULL)
{
if (!$mbox_name)
$mbox_name = $this->mailbox;
@@ -2844,7 +2853,7 @@
/**
* @access private
*/
- function _id2uid($id, $mbox_name=NULL)
+ private function _id2uid($id, $mbox_name=NULL)
{
if (!$mbox_name)
$mbox_name = $this->mailbox;
@@ -2866,14 +2875,14 @@
* Subscribe/unsubscribe a list of mailboxes and update local cache
* @access private
*/
- function _change_subscription($a_mboxes, $mode)
+ private function _change_subscription($a_mboxes, $mode)
{
$updated = FALSE;
if (is_array($a_mboxes))
foreach ($a_mboxes as $i => $mbox_name)
{
- $mailbox = $this->_mod_mailbox($mbox_name);
+ $mailbox = $this->mod_mailbox($mbox_name);
$a_mboxes[$i] = $mailbox;
if ($mode=='subscribe')
@@ -2910,7 +2919,7 @@
* Increde/decrese messagecount for a specific mailbox
* @access private
*/
- function _set_messagecount($mbox_name, $mode, $increment)
+ private function _set_messagecount($mbox_name, $mode, $increment)
{
$a_mailbox_cache = FALSE;
$mailbox = $mbox_name ? $mbox_name : $this->mailbox;
@@ -2939,7 +2948,7 @@
* Remove messagecount of a specific mailbox from cache
* @access private
*/
- function _clear_messagecount($mbox_name='')
+ private function _clear_messagecount($mbox_name='')
{
$a_mailbox_cache = FALSE;
$mailbox = $mbox_name ? $mbox_name : $this->mailbox;
@@ -2958,7 +2967,7 @@
* Split RFC822 header string into an associative array
* @access private
*/
- function _parse_headers($headers)
+ private function _parse_headers($headers)
{
$a_headers = array();
$lines = explode("\n", $headers);
@@ -2981,7 +2990,7 @@
/**
* @access private
*/
- function _parse_address_list($str, $decode=true)
+ private function _parse_address_list($str, $decode=true)
{
// remove any newlines and carriage returns before
$a = rcube_explode_quoted_string('[,;]', preg_replace( "/[\r\n]/", " ", $str));
@@ -3034,6 +3043,13 @@
var $d_parameters = array();
var $ctype_parameters = array();
+ function __clone()
+ {
+ if (isset($this->parts))
+ foreach ($this->parts as $idx => $part)
+ if (is_object($part))
+ $this->parts[$idx] = clone $part;
+ }
}
--
Gitblit v1.9.1