diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-23 19:01:53 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-23 19:01:53 +0000 |
| commit | c0bc2a0efc9355ae528bfa7c964bfc8e02f3c7fe (patch) | |
| tree | 89b66046ee3ba6f4dca5ada1e2d04e07384f1bc0 /roundcubemail/program | |
| parent | f444819d728b1da6f51e994d075057d2ab2c3b3a (diff) | |
- Prevent from setting INBOX as any of special folders (#1486114)
git-svn-id: https://svn.roundcube.net/trunk@2985 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 5 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/edit_prefs.inc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index a99504cf5..97a3db16c 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -1152,11 +1152,12 @@ function rcmail_mailbox_select($p = array()) { global $RCMAIL; - $p += array('maxlength' => 100, 'relanames' => false); + $p += array('maxlength' => 100, 'realnames' => false); $a_mailboxes = array(); foreach ($RCMAIL->imap->list_mailboxes() as $folder) - rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter()); + if (empty($p['exceptions']) || !in_array($folder, $p['exceptions'])) + rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter()); $select = new html_select($p); diff --git a/roundcubemail/program/steps/settings/edit_prefs.inc b/roundcubemail/program/steps/settings/edit_prefs.inc index 38343b55f..6abfb00c2 100644 --- a/roundcubemail/program/steps/settings/edit_prefs.inc +++ b/roundcubemail/program/steps/settings/edit_prefs.inc @@ -375,7 +375,8 @@ function rcmail_user_prefs_block($part, $attrib) // Configure special folders if (!isset($no_override['default_imap_folders'])) { $RCMAIL->imap_init(true); - $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30)); + $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, + 'maxlength' => 30, 'exceptions' => array('INBOX'))); if (!isset($no_override['drafts_mbox'])) $blocks['main']['options']['drafts_mbox'] = array( |