diff options
| author | alecpl <alec@alec.pl> | 2011-05-16 13:53:08 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-05-16 13:53:08 +0000 |
| commit | a509bb677ca626315d71e07afc8342a0690b6859 (patch) | |
| tree | e55d28844812e713157aeeab2ed378adebd2ab05 /program/steps | |
| parent | 9b6c82fdc8e0f74a1ca0f838e710c944c5526f65 (diff) | |
- Add option to set default action of Forward button to "Forward as attachment"
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/func.inc | 6 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 36b4c02a6..e0504e658 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -106,6 +106,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter()); $OUTPUT->set_env('threading', (bool) $IMAP->threading); $OUTPUT->set_env('threads', $IMAP->threading || $IMAP->get_capability('THREAD')); + $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0)); if ($CONFIG['flag_for_deletion']) $OUTPUT->set_env('flag_for_deletion', true); @@ -115,9 +116,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $OUTPUT->set_env('skip_deleted', true); if ($CONFIG['display_next']) $OUTPUT->set_env('display_next', true); - - $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0)); - + if ($CONFIG['forward_attachment']) + $OUTPUT->set_env('forward_attachment', true); if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); if ($CONFIG['drafts_mbox']) diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 1d7a32693..8c063e8ea 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -64,6 +64,8 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $OUTPUT->set_env('display_next', true); if ($MESSAGE->headers->others['list-post']) $OUTPUT->set_env('list_post', true); + if ($CONFIG['forward_attachment']) + $OUTPUT->set_env('forward_attachment', true); if (!$OUTPUT->ajax_call) $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', |