From bc04a7ee78544d2b898e0123b19a77850e96737d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 18 Nov 2009 08:58:15 -0500
Subject: [PATCH] - fix creating default folder when moving message and target folder doesn't exists
---
program/include/rcube_imap.php | 54 +++++++++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 6e98b20..7c8a262 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -112,7 +112,7 @@
$ICL_PORT = $port;
$IMAP_USE_INTERNAL_DATE = false;
-
+
$attempt = 0;
do {
$data = rcmail::get_instance()->plugins->exec_hook('imap_connect', array('host' => $host, 'user' => $user, 'attempt' => ++$attempt));
@@ -144,13 +144,13 @@
// get server properties
if ($this->conn)
{
- if (!empty($this->conn->delimiter))
- $this->delimiter = $this->conn->delimiter;
if (!empty($this->conn->rootdir))
{
$this->set_rootdir($this->conn->rootdir);
$this->root_ns = preg_replace('/[.\/]$/', '', $this->conn->rootdir);
}
+ if (empty($this->delimiter))
+ $this->get_hierarchy_delimiter();
}
return $this->conn ? TRUE : FALSE;
@@ -602,21 +602,24 @@
if ($this->index_sort && $this->sort_field == 'date')
{
if ($this->skip_deleted) {
- $msg_index = $this->_search_index($mailbox, 'ALL');
- $max = max($msg_index);
- list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
- $msg_index = array_slice($msg_index, $begin, $end-$begin);
+ // @TODO: this could be cached
+ if ($msg_index = $this->_search_index($mailbox, 'ALL UNDELETED')) {
+ $max = max($msg_index);
+ list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
+ $msg_index = array_slice($msg_index, $begin, $end-$begin);
+ }
} else if ($max = iil_C_CountMessages($this->conn, $mailbox)) {
list($begin, $end) = $this->_get_message_range($max, $page);
$msg_index = range($begin+1, $end);
} else
- return array();
+ $msg_index = array();
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);
+ if ($msg_index)
+ $this->_fetch_headers($mailbox, join(",", $msg_index), $a_msg_headers, $cache_key);
}
// use SORT command
else if ($this->get_capability('sort') && ($msg_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')))
@@ -632,13 +635,8 @@
$this->_fetch_headers($mailbox, join(',', $msg_index), $a_msg_headers, $cache_key);
}
// fetch specified header for all messages and sort
- else
+ else if ($a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", $this->sort_field, $this->skip_deleted))
{
- $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", $this->sort_field, $this->skip_deleted);
-
- if (empty($a_index))
- return array();
-
asort($a_index); // ASC
$msg_index = array_keys($a_index);
$max = max($msg_index);
@@ -1225,17 +1223,15 @@
else
$this->struct_charset = $this->_structure_charset($structure);
- /*
- @TODO: here we can recognize malformed BODYSTRUCTURE and parse
- the message in other way to create our own message structure.
- Example of structure for malformed MIME message:
- ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2154 70 NIL NIL NIL)
-
- if ($headers->ctype != 'text/plain'
- && !is_array($structure[0]) && $structure[0] == 'text'
- && !is_array($structure[1]) && $structure[1] == 'plain')
- { }
- */
+ // Here we can recognize malformed BODYSTRUCTURE and
+ // 1. [@TODO] parse the message in other way to create our own message structure
+ // 2. or just show the raw message body.
+ // Example of structure for malformed MIME message:
+ // ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2154 70 NIL NIL NIL)
+ if ($headers->ctype && $headers->ctype != 'text/plain'
+ && $structure[0] == 'text' && $structure[1] == 'plain') {
+ return false;
+ }
$struct = &$this->_structure_part($structure);
$struct->headers = get_object_vars($headers);
@@ -1554,7 +1550,7 @@
// convert charset (if text or message part)
if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message') {
// assume default if no charset specified
- if (empty($o_part->charset))
+ if (empty($o_part->charset) || strtolower($o_part->charset) == 'us-ascii')
$o_part->charset = $this->default_charset;
$body = rcube_charset_convert($body, $o_part->charset);
@@ -1715,8 +1711,8 @@
// make sure mailbox exists
if ($to_mbox != 'INBOX' && !in_array($to_mbox, $this->_list_mailboxes()))
{
- if (in_array($to_mbox_in, $this->default_folders))
- $this->create_mailbox($to_mbox_in, TRUE);
+ if (in_array($tbox, $this->default_folders))
+ $this->create_mailbox($tbox, TRUE);
else
return FALSE;
}
--
Gitblit v1.9.1