From 0677ca5a1e745643a9142081c4cbb7ea13e5a2e5 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 23 Jan 2006 18:12:23 -0500
Subject: [PATCH] Add created date to message cache
---
program/include/rcube_imap.inc | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index eb02115..7f91d3a 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -657,7 +657,7 @@
// cache is OK
if ($cache_status>0)
{
- $a_index = $this->get_message_cache_index($cache_key, FALSE, $this->sort_field);
+ $a_index = $this->get_message_cache_index($cache_key, TRUE, $this->sort_field, $this->sort_order);
return array_values($a_index);
}
@@ -1410,7 +1410,7 @@
}
- function get_message_cache_index($key, $force=FALSE, $sort_col='idx')
+ function get_message_cache_index($key, $force=FALSE, $sort_col='idx', $sort_order='ASC')
{
static $sa_message_index = array();
@@ -1423,7 +1423,7 @@
FROM ".get_table_name('messages')."
WHERE user_id=?
AND cache_key=?
- ORDER BY ".$sort_col." ASC",
+ ORDER BY ".$this->db->quote_identifier($sort_col)." ".$sort_order,
$_SESSION['user_id'],
$key);
@@ -1441,16 +1441,16 @@
$this->db->query(
"INSERT INTO ".get_table_name('messages')."
- (user_id, del, cache_key, idx, uid, subject, ".$this->db->quoteIdentifier('from').", ".$this->db->quoteIdentifier('to').", cc, date, size, headers)
- VALUES (?, 0, ?, ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?)",
+ (user_id, del, cache_key, created, idx, uid, subject, ".$this->db->quoteIdentifier('from').", ".$this->db->quoteIdentifier('to').", cc, date, size, headers)
+ VALUES (?, 0, ?, now(), ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?)",
$_SESSION['user_id'],
$key,
$index,
$headers->uid,
- substr($this->decode_header($headers->subject, TRUE), 0, 128),
- substr($this->decode_header($headers->from, TRUE), 0, 128),
- substr($this->decode_header($headers->to, TRUE), 0, 128),
- substr($this->decode_header($headers->cc, TRUE), 0, 128),
+ substr($this->decode_header((string)$headers->subject, TRUE), 0, 128),
+ substr($this->decode_header((string)$headers->from, TRUE), 0, 128),
+ substr($this->decode_header((string)$headers->to, TRUE), 0, 128),
+ substr($this->decode_header((string)$headers->cc, TRUE), 0, 128),
(int)$headers->size,
serialize($headers));
}
--
Gitblit v1.9.1