Changeset 1357 in subversion

Timestamp:

May 5, 2008 8:56:39 AM (5 years ago)

Author:

alec

Message:

• Fix management of folders with national characters in names (#1485036, #1485001)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -6 +6 @@
 - Installer: encode special characters in DB username/password (#1485042)
 - Do charset conversion also for from/to column on messages list
+- Fix management of folders with national characters in names (#1485036, #1485001)
 
 2008/05/02 (alec)

trunk/roundcubemail/program/steps/settings/manage_folders.inc

@@ -47 +47 @@
   {
   if (!empty($_POST['_name']))
-    $create = $IMAP->create_mailbox(trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7')), TRUE);
-
+    {
+    $name = trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7'));
+     // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
+    $name = str_replace('&-', '&', $name);
+    $create = $IMAP->create_mailbox($name, TRUE);
+    }
+  
   if ($create && $OUTPUT->ajax_call)
     {
@@ -66 +71 @@
   {
   if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname']))
-    $rename = $IMAP->rename_mailbox(($oldname = get_input_value('_folder_oldname', RCUBE_INPUT_POST)), trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, FALSE, 'UTF-7')));
-    
+    {
+    $name = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, FALSE, 'UTF-7'));
+     // #1485036 (RFC3501, 5.1.3) TODO: it should be done on read not on write
+    $name = str_replace('&-', '&', $name);
+    $rename = $IMAP->rename_mailbox(($oldname = get_input_value('_folder_oldname', RCUBE_INPUT_POST)), $name);
+    }
+
   if ($rename && $OUTPUT->ajax_call)
     {