From cbf1f3cfaa477ca1dfef372751c551f1a75e46b6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 23 Jan 2009 05:29:51 -0500
Subject: [PATCH] - Fixed creation of folders with '&' sign in name (reverted r1357)
---
program/steps/settings/manage_folders.inc | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 2af9228..9affded 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -44,8 +44,6 @@
if (!empty($_POST['_name']))
{
$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);
}
@@ -77,9 +75,6 @@
$oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST);
$name = rcube_charset_convert($name_utf8, 'UTF-8', 'UTF-7');
$oldname = rcube_charset_convert($oldname_utf8, 'UTF-8', '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, $name);
}
@@ -190,14 +185,14 @@
$a_subscribed = $IMAP->list_mailboxes();
$delimiter = $IMAP->get_hierarchy_delimiter();
$a_js_folders = $seen_folders = $list_folders = array();
-
+
// pre-process folders list
foreach ($a_unsubscribed as $i => $folder) {
$foldersplit = explode($delimiter, $folder);
$name = rcube_charset_convert(array_pop($foldersplit), 'UTF-7');
$parent_folder = join($delimiter, $foldersplit);
$level = count($foldersplit);
-
+
// add any necessary "virtual" parent folders
if ($parent_folder && !$seen[$parent_folder]) {
for ($i=1; $i<=$level; $i++) {
--
Gitblit v1.9.1