summaryrefslogtreecommitdiff
path: root/program/include/rcube_config.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-11-27 11:25:31 +0000
committeralecpl <alec@alec.pl>2008-11-27 11:25:31 +0000
commit9abd0f0089db877d2f6ec9f3a0b978ef3f11ce86 (patch)
tree64da0966ad637dedff2942fd09dc37182363831a /program/include/rcube_config.php
parent64aa248cdb1f7ac712a7860199bc5a08e45df47d (diff)
- Allow UTF-8 folder names in config (#1485579)
- Add junk_mbox option configuration in installer (#1485579)
Diffstat (limited to 'program/include/rcube_config.php')
-rw-r--r--program/include/rcube_config.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 0723834bf..4dcee53b2 100644
--- a/program/include/rcube_config.php
+++ b/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);