Changeset 9abd0f0 in github

Timestamp:

Nov 27, 2008 6:25:31 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

b2265ae

Parents:

64aa248

Message:

• Allow UTF-8 folder names in config (#1485579)
• Add junk_mbox option configuration in installer (#1485579)

Files:

• CHANGELOG (modified) (1 diff)
• installer/config.php (modified) (2 diffs)
• installer/utils.php (modified) (1 diff)
• program/include/rcube_config.php (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/11/26 (alec)
+----------
+- Allow UTF-8 folder names in config (#1485579)
+- Add junk_mbox option configuration in installer (#1485579)
 
 2008/11/23 (thomasb)

installer/config.php

@@ -349 +349 @@
 
 ?>
-<div>Store sent messages is this folder</div>
+<div>Store sent messages in this folder</div>
 
 <p class="hint">Leave blank if sent messages should not be stored</p>
@@ -375 +375 @@
 
 ?>
-<div>Store draft messages is this folder</div>
-</dd>
-
+<div>Store draft messages in this folder</div>
+
+<p class="hint">Leave blank if they should not be stored</p>
+</dd>
+
+<dt class="propname">junk_mbox</dt>
+<dd>
+<?php
+
+$text_junkmbox = new html_inputfield(array('name' => '_junk_mbox', 'size' => 20, 'id' => "cfgjunkmbox"));
+echo $text_junkmbox->show($RCI->getprop('junk_mbox'));
+
+?>
+<div>Store spam messages in this folder</div>
+</dd>
 </dl>
 </fieldset>

installer/utils.php

@@ -25 +25 @@
 function Q($string)
 {
-  return htmlentities($string);
+  return htmlentities($string, ENT_COMPAT, 'UTF-8');
 }
 

program/include/rcube_config.php

@@ -75 +75 @@
     $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) {