Changeset 821 in subversion

Timestamp:

Sep 26, 2007 5:16:33 AM (6 years ago)

Author:

robin

Message:

Fix folder-management when delimiter is empty (re-closes #1457344).

File:

• trunk/roundcubemail/program/steps/settings/manage_folders.inc (modified) (3 diffs)

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

@@ -54 +54 @@
   if ($create && $OUTPUT->ajax_call)
     {
-    $display_create = str_repeat('    ', substr_count($create, $IMAP->delimiter)) . preg_replace('/.*' . preg_quote($IMAP->delimiter) . '/', '', rcube_charset_convert($create, 'UTF-7'));
+    $foldersplit = explode($IMAP->delimiter, $create);
+    $display_create = str_repeat('    ', substr_count($create, $IMAP->delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
     $OUTPUT->command('add_folder_row', $create, $display_create);
     $OUTPUT->send();
@@ -75 +76 @@
   if ($rename && $OUTPUT->ajax_call)
     {
-    $display_rename = str_repeat('    ', substr_count($rename, $IMAP->delimiter)) . preg_replace('/.*' . preg_quote($IMAP->delimiter) . '/', '', rcube_charset_convert($rename, 'UTF-7'));
+    $foldersplit = explode($IMAP->delimiter, $rename);
+    $display_rename = str_repeat('    ', substr_count($rename, $IMAP->delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
     $OUTPUT->command('replace_folder_row', $oldname, $rename, $display_rename);
     $OUTPUT->command('reset_folder_rename');
@@ -164 +166 @@
     $zebra_class = $i%2 ? 'even' : 'odd';
     $folder_js = JQ($folder);
-    $display_folder = str_repeat('    ', substr_count($folder, $IMAP->delimiter)) . preg_replace('/.*' . preg_quote($IMAP->delimiter) . '/', '', rcube_charset_convert($folder, 'UTF-7'));
+    $foldersplit = explode($IMAP->delimiter, $folder);
+    $display_folder = str_repeat('    ', substr_count($folder, $IMAP->delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
     $folder_html = $CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders']) ? rcube_label(strtolower($folder)) : $display_folder;