diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2009-03-22 00:16:27 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2009-03-22 00:16:27 +0000 |
| commit | 0a47a5229cebb8f81fd975839a017bd32c08e38b (patch) | |
| tree | 53dfbcda20da7add5f9617c9868ca68b34507963 | |
| parent | ccbbc410c6ea7294162616dc0d1005c022ceaced (diff) | |
Make the folder where messages go when a user click the Archive button configurable through the preferences.
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 5 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/save_prefs.inc | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index c203443dd..89c566fba 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['archive_mbox']) + $OUTPUT->set_env('archive_mailbox', $CONFIG['archive_mbox']); if ($CONFIG['hamnotspam_mbox']) $OUTPUT->set_env('hamnotspam_mailbox', $CONFIG['hamnotspam_mbox']); diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 715890f9d..cc34e6895 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -326,6 +326,11 @@ function rcmail_user_prefs_block($part, $no_override, $attrib) $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox"))); } + if (!isset($no_override['archive_mbox'])) { + $table->add('title', Q(rcube_label('buttonbararchive'))); + $table->add(null, $select->show($config['archive_mbox'], array('name' => "_archive_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"))); diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc index a0b825f07..b67c73f49 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), + 'archive_mbox' => get_input_value('_archive_mbox', RCUBE_INPUT_POST), 'hamnotspam_mbox' => get_input_value('_hamnotspam_mbox', RCUBE_INPUT_POST) ); |