summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG2
-rw-r--r--SQL/mssql.initial.sql15
-rw-r--r--SQL/mssql.upgrade.sql16
-rw-r--r--SQL/mysql.initial.sql8
-rw-r--r--SQL/mysql.update.sql7
-rw-r--r--SQL/postgres.initial.sql8
-rw-r--r--SQL/postgres.update.sql7
-rw-r--r--SQL/sqlite.initial.sql8
-rw-r--r--SQL/sqlite.update.sql7
-rw-r--r--program/include/rcube_imap.php19
-rw-r--r--program/include/rcube_imap_cache.php518
-rw-r--r--program/include/rcube_imap_generic.php57
-rw-r--r--program/js/app.js19
-rw-r--r--program/steps/mail/check_recent.inc12
-rw-r--r--program/steps/mail/compose.inc6
-rw-r--r--program/steps/mail/func.inc15
-rw-r--r--program/steps/mail/list.inc5
-rw-r--r--program/steps/mail/move_del.inc2
-rw-r--r--program/steps/mail/show.inc20
19 files changed, 479 insertions, 272 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 22d2d810c..56fab72e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Cache synchronization using QRESYNC/CONDSTORE
- Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
- Trigger 'new_messages' hook for all checked folders (#1488083)
- Fix session race conditions when composing new messages
@@ -17,7 +18,6 @@ CHANGELOG Roundcube Webmail
Indexes are stored in a separate table, so there's no need to store all messages in a folder
Added threads data caching
Flags are stored separately, so flag change doesn't cause DELETE+INSERT, just UPDATE
-- Partial QRESYNC support
- Improved FETCH response handling
- Improvements in response tokenization method
- Use 'From' and 'To' labels instead of 'Sender' and 'Recipient'
diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index eb5f20bcc..b3bb1c8b8 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -11,6 +11,7 @@ CREATE TABLE [dbo].[cache_index] (
[user_id] [int] NOT NULL ,
[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
[changed] [datetime] NOT NULL ,
+ [valid] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
@@ -29,12 +30,7 @@ CREATE TABLE [dbo].[cache_messages] (
[uid] [int] NOT NULL ,
[changed] [datetime] NOT NULL ,
[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
- [seen] [char](1) NOT NULL ,
- [deleted] [char](1) NOT NULL ,
- [answered] [char](1) NOT NULL ,
- [forwarded] [char](1) NOT NULL ,
- [flagged] [char](1) NOT NULL ,
- [mdnsent] [char](1) NOT NULL ,
+ [flags] [int](1) NOT NULL ,
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
@@ -229,12 +225,7 @@ GO
ALTER TABLE [dbo].[cache_messages] ADD
CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed]
- CONSTRAINT [DF_cache_messages_seen] DEFAULT (0) FOR [seen],
- CONSTRAINT [DF_cache_messages_deleted] DEFAULT (0) FOR [deleted],
- CONSTRAINT [DF_cache_messages_answered] DEFAULT (0) FOR [answered],
- CONSTRAINT [DF_cache_messages_forwarded] DEFAULT (0) FOR [forwarded],
- CONSTRAINT [DF_cache_messages_flagged] DEFAULT (0) FOR [flagged],
- CONSTRAINT [DF_cache_messages_mdnsent] DEFAULT (0) FOR [mdnsent],
+ CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags],
GO
CREATE INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql
index 29440f950..3def890bd 100644
--- a/SQL/mssql.upgrade.sql
+++ b/SQL/mssql.upgrade.sql
@@ -175,12 +175,7 @@ CREATE TABLE [dbo].[cache_messages] (
[uid] [int] NOT NULL ,
[changed] [datetime] NOT NULL ,
[data] [text] COLLATE Latin1_General_CI_AI NOT NULL
- [seen] [char](1) NOT NULL ,
- [deleted] [char](1) NOT NULL ,
- [answered] [char](1) NOT NULL ,
- [forwarded] [char](1) NOT NULL ,
- [flagged] [char](1) NOT NULL ,
- [mdnsent] [char](1) NOT NULL ,
+ [flags] [int] NOT NULL ,
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
@@ -220,13 +215,8 @@ CREATE INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [P
GO
ALTER TABLE [dbo].[cache_messages] ADD
- CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed]
- CONSTRAINT [DF_cache_messages_seen] DEFAULT (0) FOR [seen],
- CONSTRAINT [DF_cache_messages_deleted] DEFAULT (0) FOR [deleted],
- CONSTRAINT [DF_cache_messages_answered] DEFAULT (0) FOR [answered],
- CONSTRAINT [DF_cache_messages_forwarded] DEFAULT (0) FOR [forwarded],
- CONSTRAINT [DF_cache_messages_flagged] DEFAULT (0) FOR [flagged],
- CONSTRAINT [DF_cache_messages_mdnsent] DEFAULT (0) FOR [mdnsent],
+ CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed],
+ CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]
GO
CREATE INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 32b3991e0..28a90f531 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -55,6 +55,7 @@ CREATE TABLE `cache_index` (
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
`mailbox` varchar(255) BINARY NOT NULL,
`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `valid` tinyint(1) NOT NULL DEFAULT '0',
`data` longtext NOT NULL,
CONSTRAINT `user_id_fk_cache_index` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -85,12 +86,7 @@ CREATE TABLE `cache_messages` (
`uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
`data` longtext NOT NULL,
- `seen` tinyint(1) NOT NULL DEFAULT '0',
- `deleted` tinyint(1) NOT NULL DEFAULT '0',
- `answered` tinyint(1) NOT NULL DEFAULT '0',
- `forwarded` tinyint(1) NOT NULL DEFAULT '0',
- `flagged` tinyint(1) NOT NULL DEFAULT '0',
- `mdnsent` tinyint(1) NOT NULL DEFAULT '0',
+ `flags` int(11) NOT NULL DEFAULT '0',
CONSTRAINT `user_id_fk_cache_messages` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
INDEX `changed_index` (`changed`),
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index fee18d640..7e8f98f03 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -201,12 +201,7 @@ CREATE TABLE `cache_messages` (
`uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
`data` longtext NOT NULL,
- `seen` tinyint(1) NOT NULL DEFAULT '0',
- `deleted` tinyint(1) NOT NULL DEFAULT '0',
- `answered` tinyint(1) NOT NULL DEFAULT '0',
- `forwarded` tinyint(1) NOT NULL DEFAULT '0',
- `flagged` tinyint(1) NOT NULL DEFAULT '0',
- `mdnsent` tinyint(1) NOT NULL DEFAULT '0',
+ `flags` int(11) NOT NULL DEFAULT '0',
CONSTRAINT `user_id_fk_cache_messages` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
INDEX `changed_index` (`changed`),
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index a1864c6c9..06ecad4eb 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -197,6 +197,7 @@ CREATE TABLE cache_index (
REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
mailbox varchar(255) NOT NULL,
changed timestamp with time zone DEFAULT now() NOT NULL,
+ valid smallint NOT NULL DEFAULT 0,
data text NOT NULL,
PRIMARY KEY (user_id, mailbox)
);
@@ -231,12 +232,7 @@ CREATE TABLE cache_messages (
uid integer NOT NULL,
changed timestamp with time zone DEFAULT now() NOT NULL,
data text NOT NULL,
- seen smallint NOT NULL DEFAULT 0,
- deleted smallint NOT NULL DEFAULT 0,
- answered smallint NOT NULL DEFAULT 0,
- forwarded smallint NOT NULL DEFAULT 0,
- flagged smallint NOT NULL DEFAULT 0,
- mdnsent smallint NOT NULL DEFAULT 0,
+ flags integer NOT NULL DEFAULT 0,
PRIMARY KEY (user_id, mailbox, uid)
);
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index 4bd0400c9..741495fbe 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -159,12 +159,7 @@ CREATE TABLE cache_messages (
uid integer NOT NULL,
changed timestamp with time zone DEFAULT now() NOT NULL,
data text NOT NULL,
- seen smallint NOT NULL DEFAULT 0,
- deleted smallint NOT NULL DEFAULT 0,
- answered smallint NOT NULL DEFAULT 0,
- forwarded smallint NOT NULL DEFAULT 0,
- flagged smallint NOT NULL DEFAULT 0,
- mdnsent smallint NOT NULL DEFAULT 0,
+ flags integer NOT NULL DEFAULT 0,
PRIMARY KEY (user_id, mailbox, uid)
);
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 7ec82015d..80c82a1a1 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -159,6 +159,7 @@ CREATE TABLE cache_index (
user_id integer NOT NULL,
mailbox varchar(255) NOT NULL,
changed datetime NOT NULL default '0000-00-00 00:00:00',
+ valid smallint NOT NULL DEFAULT '0',
data text NOT NULL,
PRIMARY KEY (user_id, mailbox)
);
@@ -193,12 +194,7 @@ CREATE TABLE cache_messages (
uid integer NOT NULL,
changed datetime NOT NULL default '0000-00-00 00:00:00',
data text NOT NULL,
- seen smallint NOT NULL DEFAULT '0',
- deleted smallint NOT NULL DEFAULT '0',
- answered smallint NOT NULL DEFAULT '0',
- forwarded smallint NOT NULL DEFAULT '0',
- flagged smallint NOT NULL DEFAULT '0',
- mdnsent smallint NOT NULL DEFAULT '0',
+ flags integer NOT NULL DEFAULT '0',
PRIMARY KEY (user_id, mailbox, uid)
);
diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql
index 378072c03..6f009754e 100644
--- a/SQL/sqlite.update.sql
+++ b/SQL/sqlite.update.sql
@@ -276,12 +276,7 @@ CREATE TABLE cache_messages (
uid integer NOT NULL,
changed datetime NOT NULL default '0000-00-00 00:00:00',
data text NOT NULL,
- seen smallint NOT NULL DEFAULT '0',
- deleted smallint NOT NULL DEFAULT '0',
- answered smallint NOT NULL DEFAULT '0',
- forwarded smallint NOT NULL DEFAULT '0',
- flagged smallint NOT NULL DEFAULT '0',
- mdnsent smallint NOT NULL DEFAULT '0',
+ flags integer NOT NULL DEFAULT '0',
PRIMARY KEY (user_id, mailbox, uid)
);
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index d9549affd..e9dafbf9e 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -813,7 +813,7 @@ class rcube_imap
$mailbox = $this->mailbox;
}
- return $this->_list_headers($mailbox, $page, $sort_field, $sort_order, false, $slice);
+ return $this->_list_headers($mailbox, $page, $sort_field, $sort_order, $slice);
}
@@ -1086,7 +1086,7 @@ class rcube_imap
if (!empty($parents)) {
$headers[$idx]->parent_uid = end($parents);
- if (!$header->seen)
+ if (empty($header->flags['SEEN']))
$headers[$parents[0]]->unread_children++;
}
array_push($parents, $header->uid);
@@ -3421,6 +3421,8 @@ class rcube_imap
if ($this->conn->selected != $mailbox) {
if ($this->conn->select($mailbox))
$this->mailbox = $mailbox;
+ else
+ return null;
}
$data = $this->conn->data;
@@ -3517,6 +3519,19 @@ class rcube_imap
/**
+ * Synchronizes messages cache.
+ *
+ * @param string $mailbox Folder name
+ */
+ public function mailbox_sync($mailbox)
+ {
+ if ($mcache = $this->get_mcache_engine()) {
+ $mcache->synchronize($mailbox);
+ }
+ }
+
+
+ /**
* Get message header names for rcube_imap_generic::fetchHeader(s)
*
* @return string Space-separated list of header names
diff --git a/program/include/rcube_imap_cache.php b/program/include/rcube_imap_cache.php
index 9767d5690..d30438622 100644
--- a/program/include/rcube_imap_cache.php
+++ b/program/include/rcube_imap_cache.php
@@ -61,7 +61,28 @@ class rcube_imap_cache
private $skip_deleted = false;
- public $flag_fields = array('seen', 'deleted', 'answered', 'forwarded', 'flagged', 'mdnsent');
+ /**
+ * List of known flags. Thanks to this we can handle flag changes
+ * with good performance. Bad thing is we need to know used flags.
+ */
+ public $flags = array(
+ 1 => 'SEEN', // RFC3501
+ 2 => 'DELETED', // RFC3501
+ 4 => 'ANSWERED', // RFC3501
+ 8 => 'FLAGGED', // RFC3501
+ 16 => 'DRAFT', // RFC3501
+ 32 => 'MDNSENT', // RFC3503
+ 64 => 'FORWARDED', // RFC5550
+ 128 => 'SUBMITPENDING', // RFC5550
+ 256 => 'SUBMITTED', // RFC5550
+ 512 => 'JUNK',
+ 1024 => 'NONJUNK',
+ 2048 => 'LABEL1',
+ 4096 => 'LABEL2',
+ 8192 => 'LABEL3',
+ 16384 => 'LABEL4',
+ 32768 => 'LABEL5',
+ );
/**
@@ -105,17 +126,23 @@ class rcube_imap_cache
$sort_order = strtoupper($sort_order) == 'ASC' ? 'ASC' : 'DESC';
// Seek in internal cache
- if (array_key_exists('index', $this->icache[$mailbox])
- && ($sort_field == 'ANY' || $this->icache[$mailbox]['index']['sort_field'] == $sort_field)
- ) {
- if ($this->icache[$mailbox]['index']['sort_order'] == $sort_order)
- return $this->icache[$mailbox]['index']['result'];
- else
- return array_reverse($this->icache[$mailbox]['index']['result'], true);
+ if (array_key_exists('index', $this->icache[$mailbox])) {
+ // The index was fetched from database already, but not validated yet
+ if (!array_key_exists('result', $this->icache[$mailbox]['index'])) {
+ $index = $this->icache[$mailbox]['index'];
+ }
+ // We've got a valid index
+ else if ($sort_field == 'ANY' || $this->icache[$mailbox]['index']['sort_field'] == $sort_field
+ ) {
+ if ($this->icache[$mailbox]['index']['sort_order'] == $sort_order)
+ return $this->icache[$mailbox]['index']['result'];
+ else
+ return array_reverse($this->icache[$mailbox]['index']['result'], true);
+ }
}
// Get index from DB (if DB wasn't already queried)
- if (empty($this->icache[$mailbox]['index_queried'])) {
+ if (empty($index) && empty($this->icache[$mailbox]['index_queried'])) {
$index = $this->get_index_row($mailbox);
// set the flag that DB was already queried for index
@@ -123,7 +150,8 @@ class rcube_imap_cache
// get_index() is called more than once
$this->icache[$mailbox]['index_queried'] = true;
}
- $data = null;
+
+ $data = null;
// @TODO: Think about skipping validation checks.
// If we could check only every 10 minutes, we would be able to skip
@@ -131,7 +159,7 @@ class rcube_imap_cache
// additional logic to force cache invalidation in some cases
// and many rcube_imap changes to connect when needed
- // Entry exist, check cache status
+ // Entry exists, check cache status
if (!empty($index)) {
$exists = true;
@@ -155,60 +183,33 @@ class rcube_imap_cache
}
}
else {
- // Got it in internal cache, so the row already exist
- $exists = array_key_exists('index', $this->icache[$mailbox]);
-
if ($existing) {
return null;
}
else if ($sort_field == 'ANY') {
$sort_field = '';
}
+
+ // Got it in internal cache, so the row already exist
+ $exists = array_key_exists('index', $this->icache[$mailbox]);
}
// Index not found, not valid or sort field changed, get index from IMAP server
if ($data === null) {
// Get mailbox data (UIDVALIDITY, counters, etc.) for status check
$mbox_data = $this->imap->mailbox_data($mailbox);
- $data = array();
-
- // Prevent infinite loop.
- // It happens when rcube_imap::message_index_direct() is called.
- // There id2uid() is called which will again call get_index() and so on.
- if (!$sort_field && !$this->skip_deleted)
- $this->icache['pending_index_update'] = true;
-
- if ($mbox_data['EXISTS']) {
- // fetch sorted sequence numbers
- $data_seq = $this->imap->message_index_direct($mailbox, $sort_field, $sort_order);
- // fetch UIDs
- if (!empty($data_seq)) {
- // Seek in internal cache
- if (array_key_exists('index', (array)$this->icache[$mailbox]))
- $data_uid = $this->icache[$mailbox]['index']['result'];
- else
- $data_uid = $this->imap->conn->fetchUIDs($mailbox, $data_seq);
-
- // build index
- if (!empty($data_uid)) {
- foreach ($data_seq as $seq)
- if ($uid = $data_uid[$seq])
- $data[$seq] = $uid;
- }
- }
- }
-
- // Reset internal flags
- $this->icache['pending_index_update'] = false;
+ $data = $this->get_index_data($mailbox, $sort_field, $sort_order, $mbox_data);
// insert/update
- $this->add_index_row($mailbox, $sort_field, $sort_order, $data, $mbox_data, $exists);
+ $this->add_index_row($mailbox, $sort_field, $sort_order, $data, $mbox_data,
+ $exists, $index['modseq']);
}
$this->icache[$mailbox]['index'] = array(
'result' => $data,
'sort_field' => $sort_field,
'sort_order' => $sort_order,
+ 'modseq' => !empty($index['modseq']) ? $index['modseq'] : $mbox_data['HIGHESTMODSEQ']
);
return $data;
@@ -239,9 +240,17 @@ class rcube_imap_cache
);
}
- // Get index from DB
- $index = $this->get_thread_row($mailbox);
- $data = null;
+ // Get thread from DB (if DB wasn't already queried)
+ if (empty($this->icache[$mailbox]['thread_queried'])) {
+ $index = $this->get_thread_row($mailbox);
+
+ // set the flag that DB was already queried for thread
+ // this way we'll be able to skip one SELECT, when
+ // get_thread() is called more than once or after clear()
+ $this->icache[$mailbox]['thread_queried'] = true;
+ }
+
+ $data = null;
// Entry exist, check cache status
if (!empty($index)) {
@@ -294,21 +303,21 @@ class rcube_imap_cache
return array();
}
- // Convert IDs to UIDs
// @TODO: it would be nice if we could work with UIDs only
- // then, e.g. when fetching search result, index would be not needed
+ // then index would be not needed. For now we need it to
+ // map id to uid here and to update message id for cached message
+
+ // Convert IDs to UIDs
+ $index = $this->get_index($mailbox, 'ANY');
if (!$is_uid) {
- $index = $this->get_index($mailbox, 'ANY');
foreach ($msgs as $idx => $msgid)
if ($uid = $index[$msgid])
$msgs[$idx] = $uid;
}
- $flag_fields = implode(', ', array_map(array($this->db, 'quoteIdentifier'), $this->flag_fields));
-
// Fetch messages from cache
$sql_result = $this->db->query(
- "SELECT uid, data, ".$flag_fields
+ "SELECT uid, data, flags"
." FROM ".get_table_name('cache_messages')
." WHERE user_id = ?"
." AND mailbox = ?"
@@ -321,9 +330,13 @@ class rcube_imap_cache
while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
$uid = intval($sql_arr['uid']);
$result[$uid] = $this->build_message($sql_arr);
- // save memory, we don't need a body here
+
+ // save memory, we don't need message body here (?)
$result[$uid]->body = null;
-//@TODO: update message ID according to index data?
+
+ // update message ID according to index data
+ if (!empty($index) && ($id = array_search($uid, $index)))
+ $result[$uid]->id = $id;
if (!empty($result[$uid])) {
unset($msgs[$uid]);
@@ -352,10 +365,13 @@ class rcube_imap_cache
*
* @param string $mailbox Folder name
* @param int $uid Message UID
+ * @param bool $update If message doesn't exists in cache it will be fetched
+ * from IMAP server
+ * @param bool $no_cache Enables internal cache usage
*
* @return rcube_mail_header Message data
*/
- function get_message($mailbox, $uid)
+ function get_message($mailbox, $uid, $update = true, $cache = true)
{
// Check internal cache
if (($message = $this->icache['message'])
@@ -364,10 +380,8 @@ class rcube_imap_cache
return $this->icache['message']['object'];
}
- $flag_fields = implode(', ', array_map(array($this->db, 'quoteIdentifier'), $this->flag_fields));
-
$sql_result = $this->db->query(
- "SELECT data, ".$flag_fields
+ "SELECT flags, data"
." FROM ".get_table_name('cache_messages')
." WHERE user_id = ?"
." AND mailbox = ?"
@@ -378,11 +392,14 @@ class rcube_imap_cache
$message = $this->build_message($sql_arr);
$found = true;
-//@TODO: update message ID according to index data?
+ // update message ID according to index data
+ $index = $this->get_index($mailbox, 'ANY');
+ if (!empty($index) && ($id = array_search($uid, $index)))
+ $message->id = $id;
}
// Get the message from IMAP server
- if (empty($message)) {
+ if (empty($message) && $update) {
$message = $this->imap->get_headers($uid, $mailbox, true);
// cache will be updated in close(), see below
}
@@ -393,7 +410,7 @@ class rcube_imap_cache
// - set message headers/structure (INSERT or UPDATE)
// - set \Seen flag (UPDATE)
// This way we can skip one UPDATE
- if (!empty($message)) {
+ if (!empty($message) && $cache) {
// Save current message from internal cache
$this->save_icache();
@@ -421,28 +438,26 @@ class rcube_imap_cache
if (!is_object($message) || empty($message->uid))
return;
- $msg = serialize($this->db->encode(clone $message));
-
- $flag_fields = array_map(array($this->db, 'quoteIdentifier'), $this->flag_fields);
- $flag_values = array();
+ $msg = serialize($this->db->encode(clone $message));
+ $flags = 0;
- foreach ($this->flag_fields as $flag)
- $flag_values[] = (int) $message->$flag;
+ if (!empty($message->flags)) {
+ foreach ($this->flags as $idx => $flag)
+ if (!empty($message->flags[$flag]))
+ $flags += $idx;
+ }
+ unset($msg->flags);
// update cache record (even if it exists, the update
// here will work as select, assume row exist if affected_rows=0)
if (!$force) {
- foreach ($flag_fields as $key => $val)
- $flag_data[] = $val . " = " . $flag_values[$key];
-
$res = $this->db->query(
"UPDATE ".get_table_name('cache_messages')
- ." SET data = ?, changed = ".$this->db->now()
- .", " . implode(', ', $flag_data)
+ ." SET flags = ?, data = ?, changed = ".$this->db->now()
." WHERE user_id = ?"
." AND mailbox = ?"
." AND uid = ?",
- $msg, $this->userid, $mailbox, (int) $message->uid);
+ $flags, $msg, $this->userid, $mailbox, (int) $message->uid);
if ($this->db->affected_rows())
return;
@@ -451,9 +466,9 @@ class rcube_imap_cache
// insert new record
$this->db->query(
"INSERT INTO ".get_table_name('cache_messages')
- ." (user_id, mailbox, uid, changed, data, " . implode(', ', $flag_fields) . ")"
- ." VALUES (?, ?, ?, ".$this->db->now().", ?, " . implode(', ', $flag_values) . ")",
- $this->userid, $mailbox, (int) $message->uid, $msg);
+ ." (user_id, mailbox, uid, flags, changed, data)"
+ ." VALUES (?, ?, ?, ?, ".$this->db->now().", ?)",
+ $this->userid, $mailbox, (int) $message->uid, $flags, $msg);
}
@@ -468,31 +483,31 @@ class rcube_imap_cache
*/
function change_flag($mailbox, $uids, $flag, $enabled = false)
{
- $flag = strtolower($flag);
+ $flag = strtoupper($flag);
+ $idx = (int) array_search($flag, $this->flags);
- if (in_array($flag, $this->flag_fields)) {
- // Internal cache update
- if ($uids && count($uids) == 1 && ($uid = current($uids))
- && ($message = $this->icache['message'])
- && $message['mailbox'] == $mailbox && $message['object']->uid == $uid
- ) {
- $message['object']->$flag = $enabled;
- return;
- }
-
- $this->db->query(
- "UPDATE ".get_table_name('cache_messages')
- ." SET changed = ".$this->db->now()
- .", " .$this->db->quoteIdentifier($flag) . " = " . intval($enabled)
- ." WHERE user_id = ?"
- ." AND mailbox = ?"
- .($uids !== null ? " AND uid IN (".$this->db->array2list((array)$uids, 'integer').")" : ""),
- $this->userid, $mailbox);
+ if (!$idx) {
+ return;
}
- else {
- // @TODO: SELECT+UPDATE?
- $this->remove_message($mailbox, $uids);
+
+ // Internal cache update
+ if ($uids && count($uids) == 1 && ($uid = current($uids))
+ && ($message = $this->icache['message'])
+ && $message['mailbox'] == $mailbox && $message['object']->uid == $uid
+ ) {
+ $message['object']->flags[$flag] = $enabled;
+ return;
}
+
+ $this->db->query(
+ "UPDATE ".get_table_name('cache_messages')
+ ." SET changed = ".$this->db->now()
+ .", flags = flags ".($enabled ? "+ $idx" : "- $idx")
+ ." WHERE user_id = ?"
+ ." AND mailbox = ?"
+ .($uids !== null ? " AND uid IN (".$this->db->array2list((array)$uids, 'integer').")" : "")
+ ." AND (flags & $idx) ".($enabled ? "= 0" : "= $idx"),
+ $this->userid, $mailbox);
}
@@ -533,17 +548,32 @@ class rcube_imap_cache
* Clears index cache.
*
* @param string $mailbox Folder name
+ * @param bool $remove Enable to remove the DB row
*/
- function remove_index($mailbox = null)
+ function remove_index($mailbox = null, $remove = false)
{
- $this->db->query(
- "DELETE FROM ".get_table_name('cache_index')
- ." WHERE user_id = ".intval($this->userid)
- .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
- );
+ // The index should be only removed from database when
+ // UIDVALIDITY was detected or the mailbox is empty
+ // otherwise use 'valid' flag to not loose HIGHESTMODSEQ value
+ if ($remove)
+ $this->db->query(
+ "DELETE FROM ".get_table_name('cache_index')
+ ." WHERE user_id = ".intval($this->userid)
+ .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
+ );
+ else
+ $this->db->query(
+ "UPDATE ".get_table_name('cache_index')
+ ." SET valid = 0"
+ ." WHERE user_id = ".intval($this->userid)
+ .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
+ );
- if (strlen($mailbox))
+ if (strlen($mailbox)) {
unset($this->icache[$mailbox]['index']);
+ // Index removed, set flag to skip SELECT query in get_index()
+ $this->icache[$mailbox]['index_queried'] = true;
+ }
else
$this->icache = array();
}
@@ -562,8 +592,11 @@ class rcube_imap_cache
.(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
);
- if (strlen($mailbox))
+ if (strlen($mailbox)) {
unset($this->icache[$mailbox]['thread']);
+ // Thread data removed, set flag to skip SELECT query in get_thread()
+ $this->icache[$mailbox]['thread_queried'] = true;
+ }
else
$this->icache = array();
}
@@ -577,7 +610,7 @@ class rcube_imap_cache
*/
function clear($mailbox = null, $uids = null)
{
- $this->remove_index($mailbox);
+ $this->remove_index($mailbox, true);
$this->remove_thread($mailbox);
$this->remove_message($mailbox, $uids);
}
@@ -618,7 +651,6 @@ class rcube_imap_cache
return array_search($uid, (array)$index);
}
-
/**
* Fetches index data from database
*/
@@ -626,7 +658,7 @@ class rcube_imap_cache
{
// Get index from DB
$sql_result = $this->db->query(
- "SELECT data"
+ "SELECT data, valid"
." FROM ".get_table_name('cache_index')
." WHERE user_id = ?"
." AND mailbox = ?",
@@ -636,6 +668,7 @@ class rcube_imap_cache
$data = explode('@', $sql_arr['data']);
return array(
+ 'valid' => $sql_arr['valid'],
'seq' => explode(',', $data[0]),
'uid' => explode(',', $data[1]),
'sort_field' => $data[2],
@@ -643,6 +676,7 @@ class rcube_imap_cache
'deleted' => $data[4],
'validity' => $data[5],
'uidnext' => $data[6],
+ 'modseq' => $data[7],
);
}
@@ -666,7 +700,10 @@ class rcube_imap_cache
if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
$data = explode('@', $sql_arr['data']);
+ // Uncompress data, see add_thread_row()
+ // $data[0] = str_replace(array('*', '^', '#'), array(';a:0:{}', 'i:', ';a:1:'), $data[0]);
$data[0] = unserialize($data[0]);
+
// build 'depth' and 'children' arrays
$depth = $children = array();
$this->build_thread_data($data[0], $depth, $children);
@@ -689,7 +726,7 @@ class rcube_imap_cache
* Saves index data into database
*/
private function add_index_row($mailbox, $sort_field, $sort_order,
- $data = array(), $mbox_data = array(), $exists = false)
+ $data = array(), $mbox_data = array(), $exists = false, $modseq = null)
{
$data = array(
implode(',', array_keys($data)),
@@ -699,21 +736,22 @@ class rcube_imap_cache
(int) $this->skip_deleted,
(int) $mbox_data['UIDVALIDITY'],
(int) $mbox_data['UIDNEXT'],
+ $modseq ? $modseq : $mbox_data['HIGHESTMODSEQ'],
);
$data = implode('@', $data);
if ($exists)
$sql_result = $this->db->query(
"UPDATE ".get_table_name('cache_index')
- ." SET data = ?, changed = ".$this->db->now()
+ ." SET data = ?, valid = 1, changed = ".$this->db->now()
." WHERE user_id = ?"
." AND mailbox = ?",
$data, $this->userid, $mailbox);
else
$sql_result = $this->db->query(
"INSERT INTO ".get_table_name('cache_index')
- ." (user_id, mailbox, data, changed)"
- ." VALUES (?, ?, ?, ".$this->db->now().")",
+ ." (user_id, mailbox, data, valid, changed)"
+ ." VALUES (?, ?, ?, 1, ".$this->db->now().")",
$this->userid, $mailbox, $data);
}
@@ -723,8 +761,12 @@ class rcube_imap_cache
*/
private function add_thread_row($mailbox, $data = array(), $mbox_data = array(), $exists = false)
{
+ $tree = serialize($data['tree']);
+ // This significantly reduces data length
+// $tree = str_replace(array(';a:0:{}', 'i:', ';a:1:'), array('*', '^', '#'), $tree);
+
$data = array(
- serialize($data['tree']),
+ $tree,
(int) $this->skip_deleted,
(int) $mbox_data['UIDVALIDITY'],
(int) $mbox_data['UIDNEXT'],
@@ -764,11 +806,8 @@ class rcube_imap_cache
// and many rcube_imap changes to connect when needed
// Check UIDVALIDITY
- // @TODO: while we're storing message sequence numbers in thread
- // index, should UIDVALIDITY invalidate the thread data?
if ($index['validity'] != $mbox_data['UIDVALIDITY']) {
- // the whole cache (all folders) is invalid
- $this->clear();
+ $this->clear($mailbox);
$exists = false;
return false;
}
@@ -780,8 +819,8 @@ class rcube_imap_cache
return false;
}
- // Check UIDNEXT
- if ($index['uidnext'] != $mbox_data['UIDNEXT']) {
+ // Validation flag
+ if (!$is_thread && empty($index['valid'])) {
unset($this->icache[$mailbox][$is_thread ? 'thread' : 'index']);
return false;
}
@@ -791,6 +830,19 @@ class rcube_imap_cache
return false;
}
+ // Check HIGHESTMODSEQ
+ if (!empty($index['modseq']) && !empty($mbox_data['HIGHESTMODSEQ'])
+ && $index['modseq'] == $mbox_data['HIGHESTMODSEQ']
+ ) {
+ return true;
+ }
+
+ // Check UIDNEXT
+ if ($index['uidnext'] != $mbox_data['UIDNEXT']) {
+ unset($this->icache[$mailbox][$is_thread ? 'thread' : 'index']);
+ return false;
+ }
+
// @TODO: find better validity check for threaded index
if ($is_thread) {
// check messages number...
@@ -848,6 +900,168 @@ class rcube_imap_cache
/**
+ * Synchronizes the mailbox.
+ *
+ * @param string $mailbox Folder name
+ */
+ function synchronize($mailbox)
+ {
+ // RFC4549: Synchronization Operations for Disconnected IMAP4 Clients
+ // RFC4551: IMAP Extension for Conditional STORE Operation
+ // or Quick Flag Changes Resynchronization
+ // RFC5162: IMAP Extensions for Quick Mailbox Resynchronization
+
+ // @TODO: synchronize with other methods?
+ $qresync = $this->imap->get_capability('QRESYNC');
+ $condstore = $qresync ? true : $this->imap->get_capability('CONDSTORE');
+
+ if (!$qresync && !$condstore) {
+ return;
+ }
+
+ // Get stored index
+ $index = $this->get_index_row($mailbox);
+
+ // database is empty
+ if (empty($index)) {
+ // set the flag that DB was already queried for index
+ // this way we'll be able to skip one SELECT in get_index()
+ $this->icache[$mailbox]['index_queried'] = true;
+ return;
+ }
+
+ $this->icache[$mailbox]['index'] = $index;
+
+ // no last HIGHESTMODSEQ value
+ if (empty($index['modseq'])) {
+ return;
+ }
+
+ // NOTE: make sure the mailbox isn't selected, before
+ // enabling QRESYNC and invoking SELECT
+ if ($this->imap->conn->selected !== null) {
+ $this->imap->conn->close();
+ }
+
+ // Enable QRESYNC
+ $res = $this->imap->conn->enable($qresync ? 'QRESYNC' : 'CONDSTORE');
+ if (!is_array($res)) {
+ return;
+ }
+
+ // Get mailbox data (UIDVALIDITY, HIGHESTMODSEQ, counters, etc.)
+ $mbox_data = $this->imap->mailbox_data($mailbox);
+
+ if (empty($mbox_data)) {
+ return;
+ }
+
+ // Check UIDVALIDITY
+ if ($index['validity'] != $mbox_data['UIDVALIDITY']) {
+ $this->clear($mailbox);
+ return;
+ }
+
+ // QRESYNC not supported on specified mailbox
+ if (!empty($mbox_data['NOMODSEQ']) || empty($mbox_data['HIGHESTMODSEQ'])) {
+ return;
+ }
+
+ // Nothing new
+ if ($mbox_data['HIGHESTMODSEQ'] == $index['modseq']) {
+ return;
+ }
+
+ // Get known uids
+ $uids = array();
+ $sql_result = $this->db->query(
+ "SELECT uid"
+ ." FROM ".get_table_name('cache_messages')
+ ." WHERE user_id = ?"
+ ." AND mailbox = ?",
+ $this->userid, $mailbox);
+
+ while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+ $uids[] = $sql_arr['uid'];
+ }
+
+ // No messages in database, nothing to sync
+ if (empty($uids)) {
+ return;
+ }
+
+ // Get modified flags and vanished messages
+ // UID FETCH 1:* (FLAGS) (CHANGEDSINCE 0123456789 VANISHED)
+ $result = $this->imap->conn->fetch($mailbox,
+ !empty($uids) ? $uids : '1:*', true, array('FLAGS'),
+ $index['modseq'], $qresync);
+
+ if (!empty($result)) {
+ foreach ($result as $id => $msg) {
+ $uid = $msg->uid;
+ // Remove deleted message
+ if ($this->skip_deleted && !empty($msg->flags['DELETED'])) {
+ $this->remove_message($mailbox, $uid);
+ continue;
+ }
+
+ $flags = 0;
+ if (!empty($msg->flags)) {
+ foreach ($this->flags as $idx => $flag)
+ if (!empty($msg->flags[$flag]))
+ $flags += $idx;
+ }
+
+ $this->db->query(
+ "UPDATE ".get_table_name('cache_messages')
+ ." SET flags = ?, changed = ".$this->db->now()
+ ." WHERE user_id = ?"
+ ." AND mailbox = ?"
+ ." AND uid = ?"
+ ." AND flags <> ?",
+ $flags, $this->userid, $mailbox, $uid, $flags);
+ }
+ }
+
+ // Get VANISHED
+ if ($qresync) {
+ $mbox_data = $this->imap->mailbox_data($mailbox);
+
+ // Removed messages
+ if (!empty($mbox_data['VANISHED'])) {
+ $uids = rcube_imap_generic::uncompressMessageSet($mbox_data['VANISHED']);
+ if (!empty($uids)) {
+ // remove messages from database
+ $this->remove_message($mailbox, $uids);
+
+ // Invalidate thread indexes (?)
+ $this->remove_thread($mailbox);
+ }
+ }
+ }
+
+ $sort_field = $index['sort_field'];
+ $sort_order = $index['sort_order'];
+ $exists = true;
+
+ // Validate index
+ if (!$this->validate($mailbox, $index, $exists)) {
+ // Update index
+ $data = $this->get_index_data($mailbox, $sort_field, $sort_order, $mbox_data);
+ }
+ else {
+ $data = array_combine($index['seq'], $index['uid']);
+ }
+
+ // update index and/or HIGHESTMODSEQ value
+ $this->add_index_row($mailbox, $sort_field, $sort_order, $data, $mbox_data, $exists);
+
+ // update internal cache for get_index()
+ $this->icache[$mailbox]['index']['result'] = $data;
+ }
+
+
+ /**
* Converts cache row into message object.
*
* @param array $sql_arr Message row data
@@ -859,8 +1073,10 @@ class rcube_imap_cache
$message = $this->db->decode(unserialize($sql_arr['data']));
if ($message) {
- foreach ($this->flag_fields as $field)
- $message->$field = (bool) $sql_arr[$field];
+ $message->flags = array();
+ foreach ($this->flags as $idx => $flag)
+ if (($sql_arr['flags'] & $idx) == $idx)
+ $message->flags[$flag] = true;
}
return $message;
@@ -906,10 +1122,10 @@ class rcube_imap_cache
/**
* Prepares message object to be stored in database.
*/
- private function message_object_prepare($msg, $recursive = false)
+ private function message_object_prepare($msg)
{
- // Remove body too big (>500kB)
- if ($recursive || ($msg->body && strlen($msg->body) > 500 * 1024)) {
+ // Remove body too big (>25kB)
+ if ($msg->body && strlen($msg->body) > 25 * 1024) {
unset($msg->body);
}
@@ -922,10 +1138,56 @@ class rcube_imap_cache
if (is_array($msg->structure->parts)) {
foreach ($msg->structure->parts as $idx => $part) {
- $msg->structure->parts[$idx] = $this->message_object_prepare($part, true);
+ $msg->structure->parts[$idx] = $this->message_object_prepare($part);
}
}
return $msg;
}
+
+
+ /**
+ * Fetches index data from IMAP server
+ */
+ private function get_index_data($mailbox, $sort_field, $sort_order, $mbox_data = array())
+ {
+ $data = array();
+
+ if (empty($mbox_data)) {
+ $mbox_data = $this->imap->mailbox_data($mailbox);
+ }
+
+ // Prevent infinite loop.
+ // It happens when rcube_imap::message_index_direct() is called.
+ // There id2uid() is called which will again call get_index() and so on.
+ if (!$sort_field && !$this->skip_deleted)
+ $this->icache['pending_index_update'] = true;
+
+ if ($mbox_data['EXISTS']) {
+ // fetch sorted sequence numbers
+ $data_seq = $this->imap->message_index_direct($mailbox, $sort_field, $sort_order);
+ // fetch UIDs
+ if (!empty($data_seq)) {
+ // Seek in internal cache
+ if (array_key_exists('index', (array)$this->icache[$mailbox])
+ && array_key_exists('result', (array)$this->icache[$mailbox]['index'])
+ )
+ $data_uid = $this->icache[$mailbox]['index']['result'];
+ else
+ $data_uid = $this->imap->conn->fetchUIDs($mailbox, $data_seq);
+
+ // build index
+ if (!empty($data_uid)) {
+ foreach ($data_seq as $seq)
+ if ($uid = $data_uid[$seq])
+ $data[$seq] = $uid;
+ }
+ }
+ }
+
+ // Reset internal flags
+ $this->icache['pending_index_update'] = false;
+
+ return $data;
+ }
}
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index be520d3b1..55eb8fa42 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -6,6 +6,7 @@
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2010, The Roundcube Dev Team |
+ | Copyright (C) 2011, Kolab Systems AG |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -54,15 +55,8 @@ class rcube_mail_header
public $references;
public $priority;
public $mdn_to;
-
- public $flags;
- public $mdnsent = false;
- public $seen = false;
- public $deleted = false;
- public $answered = false;
- public $forwarded = false;
- public $flagged = false;
public $others = array();
+ public $flags = array();
}
// For backward compatibility with cached messages (#1486602)
@@ -689,7 +683,7 @@ class rcube_imap_generic
// initialize connection
$this->error = '';
$this->errornum = self::ERROR_OK;
- $this->selected = '';
+ $this->selected = null;
$this->user = $user;
$this->host = $host;
$this->logged = false;
@@ -886,7 +880,7 @@ class rcube_imap_generic
return false;
}
- if ($this->selected == $mailbox) {
+ if ($this->selected === $mailbox) {
return true;
}
/*
@@ -1049,7 +1043,7 @@ class rcube_imap_generic
$result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);
if ($result == self::ERROR_OK) {
- $this->selected = ''; // state has changed, need to reselect
+ $this->selected = null; // state has changed, need to reselect
return true;
}
@@ -1067,7 +1061,7 @@ class rcube_imap_generic
$result = $this->execute('CLOSE', NULL, self::COMMAND_NORESPONSE);
if ($result == self::ERROR_OK) {
- $this->selected = '';
+ $this->selected = null;
return true;
}
@@ -1134,7 +1128,7 @@ class rcube_imap_generic
}
if ($res) {
- if ($this->selected == $mailbox)
+ if ($this->selected === $mailbox)
$res = $this->close();
else
$res = $this->expunge($mailbox);
@@ -1153,10 +1147,10 @@ class rcube_imap_generic
function countMessages($mailbox, $refresh = false)
{
if ($refresh) {
- $this->selected = '';
+ $this->selected = null;
}
- if ($this->selected == $mailbox) {
+ if ($this->selected === $mailbox) {
return $this->data['EXISTS'];
}
@@ -1190,7 +1184,7 @@ class rcube_imap_generic
$this->select($mailbox);
- if ($this->selected == $mailbox) {
+ if ($this->selected === $mailbox) {
return $this->data['RECENT'];
}
@@ -1676,31 +1670,10 @@ class rcube_imap_generic
else if ($name == 'FLAGS') {
if (!empty($value)) {
foreach ((array)$value as $flag) {
- $flag = str_replace('\\', '', $flag);
-
- switch (strtoupper($flag)) {
- case 'SEEN':
- $result[$id]->seen = true;
- break;
- case 'DELETED':
- $result[$id]->deleted = true;
- break;
- case 'ANSWERED':
- $result[$id]->answered = true;
- break;
- case '$FORWARDED':
- $result[$id]->forwarded = true;
- break;
- case '$MDNSENT':
- $result[$id]->mdnsent = true;
- break;
- case 'FLAGGED':
- $result[$id]->flagged = true;
- break;
- default:
- $result[$id]->flags[] = $flag;
- break;
- }
+ $flag = str_replace(array('$', '\\'), '', $flag);
+ $flag = strtoupper($flag);
+
+ $result[$id]->flags[$flag] = true;
}
}
}
@@ -1812,7 +1785,7 @@ class rcube_imap_generic
// VANISHED response (QRESYNC RFC5162)
// Sample: * VANISHED (EARLIER) 300:310,405,411
- else if (preg_match('/^\* VANISHED [EARLIER]*/i', $line, $match)) {
+ else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
$line = substr($line, strlen($match[0]));
$v_data = $this->tokenizeResponse($line, 1);
diff --git a/program/js/app.js b/program/js/app.js
index e62bd00d4..38a15cf0a 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1647,8 +1647,8 @@ function rcube_webmail()
// merge flags over local message object
$.extend(this.env.messages[uid], {
deleted: flags.deleted?1:0,
- replied: flags.replied?1:0,
- unread: flags.unread?1:0,
+ replied: flags.answered?1:0,
+ unread: !flags.seen?1:0,
forwarded: flags.forwarded?1:0,
flagged: flags.flagged?1:0,
has_children: flags.has_children?1:0,
@@ -1671,10 +1671,10 @@ function rcube_webmail()
message = this.env.messages[uid],
css_class = 'message'
+ (even ? ' even' : ' odd')
- + (flags.unread ? ' unread' : '')
+ + (!flags.seen ? ' unread' : '')
+ (flags.deleted ? ' deleted' : '')
+ (flags.flagged ? ' flagged' : '')
- + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
+ + (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
+ (message.selected ? ' selected' : ''),
// for performance use DOM instead of jQuery here
row = document.createElement('tr'),
@@ -1689,12 +1689,12 @@ function rcube_webmail()
css_class += ' status';
if (flags.deleted)
css_class += ' deleted';
- else if (flags.unread)
+ else if (!flags.seen)
css_class += ' unread';
else if (flags.unread_children > 0)
css_class += ' unreadchildren';
}
- if (flags.replied)
+ if (flags.answered)
css_class += ' replied';
if (flags.forwarded)
css_class += ' forwarded';
@@ -1762,7 +1762,7 @@ function rcube_webmail()
else if (c == 'status') {
if (flags.deleted)
css_class = 'deleted';
- else if (flags.unread)
+ else if (!flags.seen)
css_class = 'unread';
else if (flags.unread_children > 0)
css_class = 'unreadchildren';
@@ -2056,8 +2056,7 @@ function rcube_webmail()
new_row = tbody.firstChild;
while (new_row) {
- if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid])
- && r.unread_children) {
+ if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
this.message_list.expand_all(r);
this.set_unread_children(r.uid);
}
@@ -3542,7 +3541,7 @@ function rcube_webmail()
this.insert_recipient = function(id)
{
- if (!this.env.contacts[id] || !this.ksearch_input)
+ if (id === null || !this.env.contacts[id] || !this.ksearch_input)
return;
// get cursor pos
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 0eab345ec..c7d607cf9 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -34,16 +34,24 @@ else {
// check recent/unseen counts
foreach ($a_mailboxes as $mbox_name) {
+ $is_current = $mbox_name == $current;
+ if ($is_current) {
+ // Synchronize mailbox cache, handle flag changes
+ $IMAP->mailbox_sync($mbox_name);
+ }
+
+ // Get mailbox status
$status = $IMAP->mailbox_status($mbox_name);
if ($status & 1) {
// trigger plugin hook
- $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name));
+ $RCMAIL->plugins->exec_hook('new_messages',
+ array('mailbox' => $mbox_name, 'is_current' => $is_current));
}
rcmail_send_unread_count($mbox_name, true);
- if ($status && $mbox_name == $current) {
+ if ($status && $is_current) {
// refresh saved search set
$search_request = get_input_value('_search', RCUBE_INPUT_GPC);
if ($search_request && isset($_SESSION['search'])
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 4307c36d0..ade2738db 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -156,14 +156,14 @@ if (!empty($msg_uid))
// re-set 'prefer_html' to have possibility to use html part for compose
$CONFIG['prefer_html'] = $CONFIG['prefer_html'] || $CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT;
$MESSAGE = new rcube_message($msg_uid);
-
+
// make sure message is marked as read
- if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen)
+ if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']))
$IMAP->set_flag($msg_uid, 'SEEN');
if (!empty($MESSAGE->headers->charset))
$IMAP->set_charset($MESSAGE->headers->charset);
-
+
if ($compose_mode == RCUBE_COMPOSE_REPLY)
{
$_SESSION['compose']['reply_uid'] = $msg_uid;
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 36b18ce48..cbcc71afa 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -287,6 +287,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$a_msg_cols[$col] = $cont;
}
+ $a_msg_flags = array_change_key_case(array_map('intval', (array) $header->flags));
if ($header->depth)
$a_msg_flags['depth'] = $header->depth;
else if ($header->has_children)
@@ -297,16 +298,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$a_msg_flags['has_children'] = $header->has_children;
if ($header->unread_children)
$a_msg_flags['unread_children'] = $header->unread_children;
- if ($header->deleted)
- $a_msg_flags['deleted'] = 1;
- if (!$header->seen)
- $a_msg_flags['unread'] = 1;
- if ($header->answered)
- $a_msg_flags['replied'] = 1;
- if ($header->forwarded)
- $a_msg_flags['forwarded'] = 1;
- if ($header->flagged)
- $a_msg_flags['flagged'] = 1;
if ($header->others['list-post'])
$a_msg_flags['ml'] = 1;
if ($header->priority)
@@ -315,7 +306,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$a_msg_flags['ctype'] = Q($header->ctype);
$a_msg_flags['mbox'] = $mbox;
- // merge with plugin result
+ // merge with plugin result (Deprecated, use $header->flags)
if (!empty($header->list_flags) && is_array($header->list_flags))
$a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
if (!empty($header->list_cols) && is_array($header->list_cols))
@@ -1454,7 +1445,7 @@ function rcmail_send_mdn($message, &$smtp_error)
if (!is_object($message) || !is_a($message, 'rcube_message'))
$message = new rcube_message($message);
- if ($message->headers->mdn_to && !$message->headers->mdnsent &&
+ if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')))
{
$identity = $RCMAIL->user->get_identity();
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index dac7ff5e2..1f6c21e43 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -53,6 +53,9 @@ if ($save_arr)
$mbox_name = $IMAP->get_mailbox_name();
+// Synchronize mailbox cache, handle flag changes
+$IMAP->mailbox_sync($mbox_name);
+
// initialize searching result if search_filter is used
if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL')
{
@@ -116,5 +119,3 @@ else {
// send response
$OUTPUT->send();
-
-
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 8ce770102..e77979add 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -116,7 +116,7 @@ else
rcmail_set_unseen_count($mbox, $unseen_count);
}
- if ($RCMAIL->action=='moveto' && strlen($target)) {
+ if ($RCMAIL->action == 'moveto' && strlen($target)) {
rcmail_send_unread_count($target, true);
}
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index ba172c7ae..0766583a4 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -76,12 +76,13 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
'movingmessage', 'deletingmessage');
// check for unset disposition notification
- if ($MESSAGE->headers->mdn_to &&
- !$MESSAGE->headers->mdnsent && !$MESSAGE->headers->seen &&
- ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*')) &&
- $mbox_name != $CONFIG['drafts_mbox'] &&
- $mbox_name != $CONFIG['sent_mbox'])
- {
+ if ($MESSAGE->headers->mdn_to
+ && empty($MESSAGE->headers->flags['MDNSENT'])
+ && empty($MESSAGE->headers->flags['SEEN'])
+ && ($IMAP->check_permflag('MDNSENT') || $IMAP->check_permflag('*'))
+ && $mbox_name != $CONFIG['drafts_mbox']
+ && $mbox_name != $CONFIG['sent_mbox']
+ ) {
$mdn_cfg = intval($CONFIG['mdn_requests']);
if ($mdn_cfg == 1 || (($mdn_cfg == 3 || $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
@@ -100,9 +101,12 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
}
}
- if (!$MESSAGE->headers->seen && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
+ if (empty($MESSAGE->headers->flags['SEEN'])
+ && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0))
+ ) {
$RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid,
'mailbox' => $mbox_name, 'message' => $MESSAGE));
+ }
}
@@ -199,7 +203,7 @@ else
// mark message as read
-if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen &&
+if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']) &&
($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
{
if ($IMAP->set_flag($MESSAGE->uid, 'SEEN')) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 17:16:46 +0000