summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2008-01-31 14:34:50 +0000
committersvncommit <devs@roundcube.net>2008-01-31 14:34:50 +0000
commit1f020b588c1bd215f1d3c713f5dc04b131375b9b (patch)
treea56580e8f1c0b249ff3d07547718f06dacf4d6b8 /program/steps/mail
parent39fd6951264e2c691580277fd295278f273d1d77 (diff)
Remember search results (closes #1483883).
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc4
-rw-r--r--program/steps/mail/search.inc3
-rw-r--r--program/steps/mail/show.inc33
3 files changed, 35 insertions, 5 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index de8987248..b508a1fcb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -48,7 +48,11 @@ if (!isset($_SESSION['sort_order']))
// set message set for search result
if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+ {
$IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
+ $OUTPUT->set_env('search_request', $_REQUEST['_search']);
+ $OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
+ }
// define url for getting message parts
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 5ed6627ef..66fcf47a3 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -89,6 +89,7 @@ if (is_array($result) && $result[0] != '')
if ($result_h != NULL)
{
$_SESSION['search'][$search_request] = $IMAP->get_search_set();
+ $_SESSION['last_text_search'] = $str;
rcmail_js_message_list($result_h);
$OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
}
@@ -107,4 +108,4 @@ $OUTPUT->set_env('pagecount', $pages);
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1));
$OUTPUT->send();
-?> \ No newline at end of file
+?>
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 1aab3302c..9a94a9493 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -80,10 +80,18 @@ if ($_GET['_uid'])
$OUTPUT->set_env('mdn_request', true);
}
- $next = $prev = -1;
+ // set message set for search result
+ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+ {
+ $IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
+ $OUTPUT->set_env('search_request', $_REQUEST['_search']);
+ }
+
+ $next = $prev = $first = $last = -1;
// get previous, first, next and last message UID
- if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
- $IMAP->get_capability('sort'))
+ if ((!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
+ $IMAP->get_capability('sort') ) && !(!empty($_REQUEST['_search']) &&
+ isset($_SESSION['search'][$_REQUEST['_search']])) )
{
// Only if we use custom sorting
$a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);
@@ -94,6 +102,23 @@ if ($_GET['_uid'])
$next = isset($a_msg_index[$MESSAGE['index']+1]) ? $a_msg_index[$MESSAGE['index']+1] : -1 ;
$last = count($a_msg_index)>0 ? $a_msg_index[count($a_msg_index)-1] : -1;
}
+ elseif (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+ {
+ $search_data = $_SESSION['search'][$_REQUEST['_search']];
+ $result = $IMAP->search(NULL, $search_data[0], $search_data[1],$search_data[3]);
+ $result = array_reverse($result);
+ foreach ($result as $key=>$rid)
+ {
+ $result[$key] = $IMAP->get_uid($rid);
+ if ($MESSAGE['UID'] == $result[$key])
+ $seq = $key;
+ }
+ $prev = isset($result[$seq-1]) ? $result[$seq-1] : -1 ;
+ $first = count($result)>0 ? $result[0] : -1;
+ $next = isset($result[$seq+1]) ? $result[$seq+1] : -1 ;
+ $last = count($result)>0 ? $result[count($result)-1] : -1;
+ $MESSAGE['index'] = $seq;
+ }
else
{
// this assumes that we are sorted by date_DESC
@@ -184,4 +209,4 @@ else if ($_action=='preview' && template_exists('messagepreview'))
parse_template('messagepreview');
else
parse_template('message');
-?> \ No newline at end of file
+?>