From 0a703a900d3aded9ed1249f313ca604bcc360cf0 Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 27 Nov 2008 11:25:31 +0000 Subject: - Allow UTF-8 folder names in config (#1485579) - Add junk_mbox option configuration in installer (#1485579) git-svn-id: https://svn.roundcube.net/trunk@2094 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_config.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php index 0723834bf..4dcee53b2 100644 --- a/roundcubemail/program/include/rcube_config.php +++ b/roundcubemail/program/include/rcube_config.php @@ -74,7 +74,14 @@ class rcube_config // fix paths $this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs'; $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp'; - + + // fix default imap folders encode + foreach (Array('draft_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder) + $this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF-7'); + + foreach ($this->prop['default_imap_folders'] as $n => $folder) + $this->prop['default_imap_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF-7'); + // set PHP error logging according to config if ($this->prop['debug_level'] & 1) { ini_set('log_errors', 1); -- cgit v1.2.3