diff options
| author | alecpl <alec@alec.pl> | 2012-04-08 16:34:36 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2012-04-08 16:34:36 +0000 |
| commit | 1b30a710cfe7fb2917ed337c52b06bb2236e1a05 (patch) | |
| tree | 80465019a2941d6fa4ea8c67cb71e1c43d2e7447 /program/steps/mail | |
| parent | 84b028ce0054a053f4aa019f311b507bb9faed08 (diff) | |
- Add option to delete messages instead of moving to Trash when in Junk folder (#1486686)
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 7d1fbaab4..8dcd37b20 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -99,6 +99,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $OUTPUT->set_env('threads', $threading || $RCMAIL->storage->get_capability('THREAD')); $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0)); + if ($CONFIG['delete_junk']) + $OUTPUT->set_env('delete_junk', true); if ($CONFIG['flag_for_deletion']) $OUTPUT->set_env('flag_for_deletion', true); if ($CONFIG['read_when_deleted']) diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index d3b70b4ab..c6c6d9636 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -52,16 +52,19 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name))); $OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter()); $OUTPUT->set_env('mailbox', $mbox_name); - if ($CONFIG['drafts_mbox']) { - $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']); - } // mimetypes supported by the browser (default settings) $mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/x-javascript,application/pdf,application/x-shockwave-flash'); $OUTPUT->set_env('mimetypes', is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes); + if ($CONFIG['drafts_mbox']) + $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']); if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); + if ($CONFIG['junk_mbox']) + $OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']); + if ($CONFIG['delete_junk']) + $OUTPUT->set_env('delete_junk', true); if ($CONFIG['flag_for_deletion']) $OUTPUT->set_env('flag_for_deletion', true); if ($CONFIG['read_when_deleted']) |