From 72dbbac60e774dbfa11bf830ff6a1667a160fbc8 Mon Sep 17 00:00:00 2001 From: thomasb Date: Thu, 31 Jul 2008 21:30:25 +0000 Subject: Show real names in folder drop-down + rebuild default_imap_folders property when saving prefs git-svn-id: https://svn.roundcube.net/trunk@1622 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/settings/save_prefs.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'roundcubemail/program/steps/settings/save_prefs.inc') diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc index ccd6e5f7b..3bccffae2 100644 --- a/roundcubemail/program/steps/settings/save_prefs.inc +++ b/roundcubemail/program/steps/settings/save_prefs.inc @@ -46,6 +46,18 @@ $a_user_prefs = array( foreach ((array)$CONFIG['dont_override'] as $p) $a_user_prefs[$p] = $CONFIG[$p]; +// special handling for 'default_imap_folders' +if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) { + foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) + $a_user_prefs[$p] = $CONFIG[$p]; +} +else { + $a_user_prefs['default_imap_folders'] = array('INBOX'); + foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) { + if ($a_user_prefs[$p]) + $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p]; + } +} // switch UI language if (isset($_POST['_language'])) { -- cgit v1.2.3