Changeset 9490b7b in github

Timestamp:

Oct 4, 2007 3:48:43 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

d03828f

Parents:

fc74920

Message:

Use object method to get imap hierarchy delimiter

Location:

program

Files:

• include/rcube_imap.inc (modified) (1 diff)
• steps/settings/manage_folders.inc (modified) (5 diffs)

program/include/rcube_imap.inc

@@ -50 +50 @@
   var $sort_field = 'date';
   var $sort_order = 'DESC';
-  var $delimiter = '/';
+  var $delimiter = NULL;
   var $caching_enabled = FALSE;
   var $default_folders = array('INBOX');

program/steps/settings/manage_folders.inc

@@ -54 +54 @@
   if ($create && $OUTPUT->ajax_call)
     {
-    $foldersplit = explode($IMAP->delimiter, $create);
-    $display_create = str_repeat('    ', substr_count($create, $IMAP->delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
+    $delimiter = $IMAP->get_hierarchy_delimiter();
+    $foldersplit = explode($delimiter, $create);
+    $display_create = str_repeat('    ', substr_count($create, $delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
     $OUTPUT->command('add_folder_row', $create, $display_create);
     $OUTPUT->send();
@@ -76 +77 @@
   if ($rename && $OUTPUT->ajax_call)
     {
-    $foldersplit = $IMAP->delimiter ? explode($IMAP->delimiter, $rename) : array($rename);
+    $delimiter = $IMAP->get_hierarchy_delimiter();
+    $foldersplit = explode($delimiter, $rename);
     $level = count($foldersplit) - 1;
     $display_rename = str_repeat('    ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
@@ -146 +148 @@
   $a_unsubscribed = $IMAP->list_unsubscribed();
   $a_subscribed = $IMAP->list_mailboxes();
+  $delimiter = $IMAP->get_hierarchy_delimiter();
   $a_js_folders = array();
  
@@ -167 +170 @@
     $zebra_class = $i%2 ? 'even' : 'odd';
     $folder_js = JQ($folder);
-    $foldersplit = $IMAP->delimiter ? explode($IMAP->delimiter, $folder) : array($folder);
+    $foldersplit = explode($delimiter, $folder);
     $level = count($foldersplit) - 1;
     $display_folder = str_repeat('    ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
@@ -215 +218 @@
   $OUTPUT->set_env('subscriptionrows', $a_js_folders);
   $OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']);
-  $OUTPUT->set_env('delimiter', $IMAP->delimiter);
+  $OUTPUT->set_env('delimiter', $delimiter);
 
   return $out;