diff options
| author | alecpl <alec@alec.pl> | 2010-10-13 19:15:51 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-10-13 19:15:51 +0000 |
| commit | f6aac389bfc29e0f6d1f2d43aa900a2ba017bc2f (patch) | |
| tree | d9c57cca7f4f110c96a16063b7000bceac77a5cf /program/steps/mail/list.inc | |
| parent | ad334a12579f21e4e04a47e257b9d0ac71d50b98 (diff) | |
- Minimize session data size by storing only last search result
and by removing search result from session after listing with empty search filter
Diffstat (limited to 'program/steps/mail/list.inc')
| -rw-r--r-- | program/steps/mail/list.inc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index b5ee1b646..f5fc44bd4 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -58,7 +58,8 @@ if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { $search_request = md5($mbox_name.$_SESSION['search_filter']); $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col); - $_SESSION['search'][$search_request] = $IMAP->get_search_set(); + $_SESSION['search'] = $IMAP->get_search_set(); + $_SESSION['search_request'] = $search_request; $OUTPUT->set_env('search_request', $search_request); } @@ -67,8 +68,16 @@ if ($count = $IMAP->messagecount($mbox_name, $IMAP->threading ? 'THREADS' : 'ALL $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order); // update search set (possible change of threading mode) -if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) - $_SESSION['search'][$_REQUEST['_search']] = $IMAP->get_search_set(); +if (!empty($_REQUEST['_search']) && isset($_SESSION['search']) + && $_SESSION['search_request'] == $_REQUEST['_search'] +) { + $_SESSION['search'] = $IMAP->get_search_set(); +} +// remove old search data +else if (empty($_REQUEST['_search']) && isset($_SESSION['search'])) { + $RCMAIL->session->remove('search'); +} + // empty result? we'll skip UNSEEN counting in rcmail_send_unread_count() if (empty($search_request) && empty($a_headers)) { |