diff options
| author | thomascube <thomas@roundcube.net> | 2010-03-03 12:11:04 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2010-03-03 12:11:04 +0000 |
| commit | 7910c0ff55edcb9ed973abd680489b9e0f28d0cb (patch) | |
| tree | 454e6565617cb80667c6f20e8ce985d1304d2acf /program/steps/mail/func.inc | |
| parent | d15d594a42e8fe4e6c11dedcd8ac3e89c445f986 (diff) | |
Remember search modifiers in user prefs (#1486146) + bring back the old defaults
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 491f79a5e..3dab087b0 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -19,6 +19,11 @@ */ +// setup some global vars used by mail steps +$SENT_MBOX = $RCMAIL->config->get('sent_mbox'); +$DRAFTS_MBOX = $RCMAIL->config->get('drafts_mbox'); +$SEARCH_MODS_DEFAULT = array('*' => array('subject'=>1, 'from'=>1), $SENT_MBOX => array('subject'=>1, 'to'=>1), $DRAFTS_MBOX => array('subject'=>1, 'to'=>1)); + $EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-z]{2,5})'; // actions that do not require imap connection @@ -79,7 +84,9 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') $OUTPUT->set_env('search_request', $search_request); } - $OUTPUT->set_env('search_mods', $_SESSION['search_mods'] ? $_SESSION['search_mods'] : array('subject'=>'subject')); + $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT); + $OUTPUT->set_env('search_mods', $search_mods); + // make sure the message count is refreshed (for default view) $IMAP->messagecount($mbox_name, 'ALL', true); } |