diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2009-03-21 23:25:00 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2009-03-21 23:25:00 +0000 |
| commit | 71a7f2a74f77d3afe0c0c3465a22f87d4827dd5a (patch) | |
| tree | 44824ffe3551c0e69dad0996ecb8bd3599d1dbda /roundcubemail/program/steps | |
| parent | fe73c456461855511f56c2447be47a21d8e09937 (diff) | |
Allow user to configure which folder is used as the HamNotSpam folder in the user preferences.
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 11 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/save_prefs.inc | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index f9c1d951d..c203443dd 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -96,6 +96,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']); if ($CONFIG['junk_mbox']) $OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']); + if ($CONFIG['hamnotspam_mbox']) + $OUTPUT->set_env('hamnotspam_mailbox', $CONFIG['hamnotspam_mbox']); if (!$OUTPUT->ajax_call) $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 6515ae4f6..715890f9d 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -321,14 +321,19 @@ function rcmail_user_prefs_block($part, $no_override, $attrib) $table->add(null, $select->show($config['sent_mbox'], array('name' => "_sent_mbox"))); } + if (!isset($no_override['trash_mbox'])) { + $table->add('title', Q(rcube_label('trash'))); + $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox"))); + } + if (!isset($no_override['junk_mbox'])) { $table->add('title', Q(rcube_label('junk'))); $table->add(null, $select->show($config['junk_mbox'], array('name' => "_junk_mbox"))); } - if (!isset($no_override['trash_mbox'])) { - $table->add('title', Q(rcube_label('trash'))); - $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox"))); + if (!isset($no_override['hamnotspam_mbox'])) { + $table->add('title', Q(rcube_label('hamnotspam'))); + $table->add(null, $select->show($config['hamnotspam_mbox'], array('name' => "_hamnotspam_mbox"))); } $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib)); diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc index 09cf63d6f..a0b825f07 100644 --- a/roundcubemail/program/steps/settings/save_prefs.inc +++ b/roundcubemail/program/steps/settings/save_prefs.inc @@ -46,6 +46,7 @@ $a_user_prefs = array( 'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST), 'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST), 'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST), + 'hamnotspam_mbox' => get_input_value('_hamnotspam_mbox', RCUBE_INPUT_POST) ); // don't override these parameters |