diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/main.inc | 36 | ||||
| -rw-r--r-- | program/include/rcmail.php | 104 | ||||
| -rw-r--r-- | program/include/rcube_imap.php | 565 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/edit_folder.inc | 20 | ||||
| -rw-r--r-- | program/steps/settings/folders.inc | 40 | ||||
| -rw-r--r-- | program/steps/settings/save_folder.inc | 3 |
7 files changed, 455 insertions, 315 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 1947e3573..baaca654d 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1228,17 +1228,20 @@ function rcmail_mailbox_select($p = array()) else $list = $RCMAIL->imap->list_mailboxes(); - foreach ($list as $folder) + $delimiter = $RCMAIL->imap->get_hierarchy_delimiter(); + + foreach ($list as $folder) { if (empty($p['exceptions']) || !in_array($folder, $p['exceptions'])) - rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter()); + rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter); + } $select = new html_select($p); - + if ($p['noselection']) $select->add($p['noselection'], ''); - + rcmail_render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames']); - + return $select; } @@ -1252,6 +1255,17 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='') { global $RCMAIL; + // Handle namespace prefix + $prefix = ''; + if (!$path) { + $n_folder = $folder; + $folder = $RCMAIL->imap->mod_mailbox($folder); + + if ($n_folder != $folder) { + $prefix = substr($n_folder, 0, -strlen($folder)); + } + } + $pos = strpos($folder, $delm); if ($pos !== false) { @@ -1272,14 +1286,14 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='') $virtual = false; } - $path .= $currentFolder; - - // Check \Noselect option (if options are in cache) - if (!$virtual && ($opts = $RCMAIL->imap->mailbox_options($path))) { - $virtual = in_array('\\Noselect', $opts); - } + $path .= $prefix.$currentFolder; if (!isset($arrFolders[$currentFolder])) { + // Check \Noselect option (if options are in cache) + if (!$virtual && ($opts = $RCMAIL->imap->mailbox_options($path))) { + $virtual = in_array('\\Noselect', $opts); + } + $arrFolders[$currentFolder] = array( 'id' => $path, 'name' => rcube_charset_convert($currentFolder, 'UTF7-IMAP'), diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 14fd7dd15..5567130e3 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -735,9 +735,13 @@ class rcmail // user already registered -> update user's record if (is_object($user)) { + // fix some old settings according to namespace prefix + $this->fix_namespace_settings($user); + // create default folders on first login if (!$user->data['last_login'] && $config['create_default_folders']) $this->imap->create_default_folders(); + // update last login timestamp $user->touch(); } // create new system user @@ -1453,4 +1457,104 @@ class rcmail return strtr($this->action, '-', '_') . '.inc'; } + /** + * Fixes some user preferences according to namespace handling change. + * Old Roundcube versions were using folder names with removed namespace prefix. + * Now we need to add the prefix on servers where personal namespace has prefix. + * + * @param rcube_user $user User object + */ + private function fix_namespace_settings($user) + { + $prefix = $this->imap->get_namespace('prefix'); + $prefix_len = strlen($prefix); + + if (!$prefix_len) + return; + + $prefs = $user->get_prefs(); + if (empty($prefs) || $prefs['namespace_fixed']) + return; + + // Build namespace prefix regexp + $ns = $this->imap->get_namespace(); + $regexp = array(); + + foreach ($ns as $entry) { + if (!empty($entry)) { + foreach ($entry as $item) { + if (strlen($item[0])) { + $regexp[] = preg_quote($item[0], '/'); + } + } + } + } + $regexp = '/^('. implode('|', $regexp).')/'; + + // Fix preferences + $opts = array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox', 'archive_mbox'); + foreach ($opts as $opt) { + if ($value = $prefs[$opt]) { + if ($value != 'INBOX' && !preg_match($regexp, $value)) { + $prefs[$opt] = $prefix.$value; + } + } + } + + if (!empty($prefs['default_imap_folders'])) { + foreach ($prefs['default_imap_folders'] as $idx => $name) { + if ($name != 'INBOX' && !preg_match($regexp, $name)) { + $prefs['default_imap_folders'][$idx] = $prefix.$name; + } + } + } + + if (!empty($prefs['search_mods'])) { + $folders = array(); + foreach ($prefs['search_mods'] as $idx => $value) { + if ($idx != 'INBOX' && $idx != '*' && !preg_match($regexp, $idx)) { + $idx = $prefix.$idx; + } + $folders[$idx] = $value; + } + $prefs['search_mods'] = $folders; + } + + if (!empty($prefs['message_threading'])) { + $folders = array(); + foreach ($prefs['message_threading'] as $idx => $value) { + if ($idx != 'INBOX' && !preg_match($regexp, $idx)) { + $idx = $prefix.$idx; + } + $folders[$prefix.$idx] = $value; + } + $prefs['message_threading'] = $folders; + } + + if (!empty($prefs['collapsed_folders'])) { + $folders = explode('&&', $prefs['collapsed_folders']); + $count = count($folders); + $folders_str = ''; + + if ($count) { + $folders[0] = substr($folders[0], 1); + $folders[$count-1] = substr($folders[$count-1], 0, -1); + } + + foreach ($folders as $value) { + if ($value != 'INBOX' && !preg_match($regexp, $value)) { + $value = $prefix.$value; + } + $folders_str .= '&'.$value.'&'; + } + $prefs['collapsed_folders'] = $folders_str; + } + + $prefs['namespace_fixed'] = true; + + // save updated preferences and reset imap settings (default folders) + $user->save_prefs($prefs); + $this->set_imap_prop(); + } + } diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 79acdeed9..d7100a6ba 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -339,13 +339,11 @@ class rcube_imap * * All operations will be perfomed on this mailbox/folder * - * @param string $new_mbox Mailbox/Folder name + * @param string $mailbox Mailbox/Folder name * @access public */ - function set_mailbox($new_mbox) + function set_mailbox($mailbox) { - $mailbox = $this->mod_mailbox($new_mbox); - if ($this->mailbox == $mailbox) return; @@ -364,7 +362,9 @@ class rcube_imap */ function select_mailbox($mailbox=null) { - $mailbox = strlen($mailbox) ? $this->mod_mailbox($mailbox) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $selected = $this->conn->select($mailbox); @@ -451,7 +451,7 @@ class rcube_imap */ function get_mailbox_name() { - return $this->conn->connected() ? $this->mod_mailbox($this->mailbox, 'out') : ''; + return $this->conn->connected() ? $this->mailbox : ''; } @@ -523,12 +523,21 @@ class rcube_imap /** * Get namespace * + * @param string $name Namespace array index: personal, other, shared, prefix + * * @return array Namespace data * @access public */ - function get_namespace() + function get_namespace($name=null) { - return $this->namespace; + $ns = $this->namespace; + + if ($name) { + return isset($ns[$name]) ? $ns[$name] : null; + } + + unset($ns['prefix']); + return $ns; } @@ -609,6 +618,12 @@ class rcube_imap } } + // Find personal namespace prefix for mod_mailbox() + // Prefix can be removed when there is only one personal namespace + if (is_array($this->namespace['personal']) && count($this->namespace['personal']) == 1) { + $this->namespace['prefix'] = $this->namespace['personal'][0][0]; + } + $_SESSION['imap_namespace'] = $this->namespace; $_SESSION['imap_delimiter'] = $this->delimiter; } @@ -617,17 +632,20 @@ class rcube_imap /** * Get message count for a specific mailbox * - * @param string $mbox_name Mailbox/folder name - * @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT] - * @param boolean $force Force reading from server and update cache - * @param boolean $status Enables storing folder status info (max UID/count), - * required for mailbox_status() + * @param string $mailbox Mailbox/folder name + * @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT] + * @param boolean $force Force reading from server and update cache + * @param boolean $status Enables storing folder status info (max UID/count), + * required for mailbox_status() * @return int Number of messages * @access public */ - function messagecount($mbox_name='', $mode='ALL', $force=false, $status=true) + function messagecount($mailbox='', $mode='ALL', $force=false, $status=true) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } + return $this->_messagecount($mailbox, $mode, $force, $status); } @@ -644,13 +662,10 @@ class rcube_imap * @access private * @see rcube_imap::messagecount() */ - private function _messagecount($mailbox='', $mode='ALL', $force=false, $status=true) + private function _messagecount($mailbox, $mode='ALL', $force=false, $status=true) { $mode = strtoupper($mode); - if (!strlen($mailbox)) - $mailbox = $this->mailbox; - // count search set if ($this->search_string && $mailbox == $this->mailbox && ($mode == 'ALL' || $mode == 'THREADS') && !$force) { if ($this->search_threads) @@ -776,7 +791,7 @@ class rcube_imap * Public method for listing headers * convert mailbox name with root dir first * - * @param string $mbox_name Mailbox/folder name + * @param string $mailbox Mailbox/folder name * @param int $page Current page to list * @param string $sort_field Header field to sort by * @param string $sort_order Sort order [ASC|DESC] @@ -784,9 +799,12 @@ class rcube_imap * @return array Indexed array with message header objects * @access public */ - function list_headers($mbox_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0) + function list_headers($mailbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } + return $this->_list_headers($mailbox, $page, $sort_field, $sort_order, false, $slice); } @@ -1346,12 +1364,14 @@ class rcube_imap * We compare the maximum UID to determine the number of * new messages because the RECENT flag is not reliable. * - * @param string $mbox_name Mailbox/folder name + * @param string $mailbox Mailbox/folder name * @return int Folder status */ - function mailbox_status($mbox_name = null) + function mailbox_status($mailbox = null) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $old = $this->get_folder_stats($mailbox); // refresh message count -> will update @@ -1378,26 +1398,27 @@ class rcube_imap * Stores folder statistic data in session * @TODO: move to separate DB table (cache?) * - * @param string $mbox_name Mailbox name - * @param string $name Data name - * @param mixed $data Data value + * @param string $mailbox Mailbox name + * @param string $name Data name + * @param mixed $data Data value */ - private function set_folder_stats($mbox_name, $name, $data) + private function set_folder_stats($mailbox, $name, $data) { - $_SESSION['folders'][$mbox_name][$name] = $data; + $_SESSION['folders'][$mailbox][$name] = $data; } /** * Gets folder statistic data * - * @param string $mbox_name Mailbox name + * @param string $mailbox Mailbox name + * * @return array Stats data */ - private function get_folder_stats($mbox_name) + private function get_folder_stats($mailbox) { - if ($_SESSION['folders'][$mbox_name]) - return (array) $_SESSION['folders'][$mbox_name]; + if ($_SESSION['folders'][$mailbox]) + return (array) $_SESSION['folders'][$mailbox]; else return array(); } @@ -1406,19 +1427,21 @@ class rcube_imap /** * Return sorted array of message IDs (not UIDs) * - * @param string $mbox_name Mailbox to get index from + * @param string $mailbox Mailbox to get index from * @param string $sort_field Sort column * @param string $sort_order Sort order [ASC, DESC] * @return array Indexed array with message IDs */ - function message_index($mbox_name='', $sort_field=NULL, $sort_order=NULL) + function message_index($mailbox='', $sort_field=NULL, $sort_order=NULL) { if ($this->threading) - return $this->thread_index($mbox_name, $sort_field, $sort_order); + return $this->thread_index($mailbox, $sort_field, $sort_order); $this->_set_sort_order($sort_field, $sort_order); - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.msgi"; // we have a saved search result, get index from there @@ -1519,16 +1542,18 @@ class rcube_imap /** * Return sorted array of threaded message IDs (not UIDs) * - * @param string $mbox_name Mailbox to get index from + * @param string $mailbox Mailbox to get index from * @param string $sort_field Sort column * @param string $sort_order Sort order [ASC, DESC] * @return array Indexed array with message IDs */ - function thread_index($mbox_name='', $sort_field=NULL, $sort_order=NULL) + function thread_index($mailbox='', $sort_field=NULL, $sort_order=NULL) { $this->_set_sort_order($sort_field, $sort_order); - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.thi"; // we have a saved search result, get index from there @@ -1693,19 +1718,21 @@ class rcube_imap /** * Invoke search request to IMAP server * - * @param string $mbox_name Mailbox name to search in + * @param string $mailbox Mailbox name to search in * @param string $str Search criteria * @param string $charset Search charset * @param string $sort_field Header field to sort by * @return array search results as list of message IDs * @access public */ - function search($mbox_name='', $str=NULL, $charset=NULL, $sort_field=NULL) + function search($mailbox='', $str=NULL, $charset=NULL, $sort_field=NULL) { if (!$str) return false; - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $results = $this->_search_index($mailbox, $str, $charset, $sort_field); @@ -1799,18 +1826,20 @@ class rcube_imap * Direct (real and simple) SEARCH request to IMAP server, * without result sorting and caching * - * @param string $mbox_name Mailbox name to search in - * @param string $str Search string - * @param boolean $ret_uid True if UIDs should be returned + * @param string $mailbox Mailbox name to search in + * @param string $str Search string + * @param boolean $ret_uid True if UIDs should be returned * @return array Search results as list of message IDs or UIDs * @access public */ - function search_once($mbox_name='', $str=NULL, $ret_uid=false) + function search_once($mailbox='', $str=NULL, $ret_uid=false) { if (!$str) return false; - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } return $this->conn->search($mailbox, $str, $ret_uid); } @@ -1979,15 +2008,17 @@ class rcube_imap /** * Return message headers object of a specific message * - * @param int $id Message ID - * @param string $mbox_name Mailbox to read from - * @param boolean $is_uid True if $id is the message UID - * @param boolean $bodystr True if we need also BODYSTRUCTURE in headers + * @param int $id Message ID + * @param string $mailbox Mailbox to read from + * @param boolean $is_uid True if $id is the message UID + * @param boolean $bodystr True if we need also BODYSTRUCTURE in headers * @return object Message headers representation */ - function get_headers($id, $mbox_name=NULL, $is_uid=true, $bodystr=false) + function get_headers($id, $mailbox=null, $is_uid=true, $bodystr=false) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $uid = $is_uid ? $id : $this->_id2uid($id, $mailbox); // get cached headers @@ -2529,13 +2560,16 @@ class rcube_imap * * @param mixed $uids Message UIDs as array or comma-separated string, or '*' * @param string $flag Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT - * @param string $mbox_name Folder name + * @param string $mailbox Folder name * @param boolean $skip_cache True to skip message cache clean up + * * @return boolean Operation status */ - function set_flag($uids, $flag, $mbox_name=NULL, $skip_cache=false) + function set_flag($uids, $flag, $mailbox=null, $skip_cache=false) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } $flag = strtoupper($flag); list($uids, $all_mode) = $this->_parse_uids($uids, $mailbox); @@ -2572,34 +2606,37 @@ class rcube_imap /** * Remove message flag for one or several messages * - * @param mixed $uids Message UIDs as array or comma-separated string, or '*' - * @param string $flag Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT - * @param string $mbox_name Folder name + * @param mixed $uids Message UIDs as array or comma-separated string, or '*' + * @param string $flag Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT + * @param string $mailbox Folder name + * * @return int Number of flagged messages, -1 on failure * @see set_flag */ - function unset_flag($uids, $flag, $mbox_name=NULL) + function unset_flag($uids, $flag, $mailbox=null) { - return $this->set_flag($uids, 'UN'.$flag, $mbox_name); + return $this->set_flag($uids, 'UN'.$flag, $mailbox); } /** * Append a mail message (source) to a specific mailbox * - * @param string $mbox_name Target mailbox - * @param string $message The message source string or filename - * @param string $headers Headers string if $message contains only the body - * @param boolean $is_file True if $message is a filename + * @param string $mailbox Target mailbox + * @param string $message The message source string or filename + * @param string $headers Headers string if $message contains only the body + * @param boolean $is_file True if $message is a filename * * @return boolean True on success, False on error */ - function save_message($mbox_name, &$message, $headers='', $is_file=false) + function save_message($mailbox, &$message, $headers='', $is_file=false) { - $mailbox = $this->mod_mailbox($mbox_name); + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } // make sure mailbox exists - if ($this->mailbox_exists($mbox_name)) { + if ($this->mailbox_exists($mailbox)) { if ($is_file) $saved = $this->conn->appendFromFile($mailbox, $message, $headers); else @@ -2625,13 +2662,13 @@ class rcube_imap */ function move_message($uids, $to_mbox, $from_mbox='') { - $fbox = $from_mbox; - $tbox = $to_mbox; - $to_mbox = $this->mod_mailbox($to_mbox); - $from_mbox = strlen($from_mbox) ? $this->mod_mailbox($from_mbox) : $this->mailbox; + if (!strlen($from_mbox)) { + $from_mbox = $this->mailbox; + } - if ($to_mbox === $from_mbox) + if ($to_mbox === $from_mbox) { return false; + } list($uids, $all_mode) = $this->_parse_uids($uids, $from_mbox); @@ -2640,18 +2677,20 @@ class rcube_imap return false; // make sure mailbox exists - if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox)) { - if (in_array($tbox, $this->default_folders)) - $this->create_mailbox($tbox, true); + if ($to_mbox != 'INBOX' && !$this->mailbox_exists($to_mbox)) { + if (in_array($to_mbox, $this->default_folders)) + $this->create_mailbox($to_mbox, true); else return false; } - // flag messages as read before moving them $config = rcmail::get_instance()->config; - if ($config->get('read_when_deleted') && $tbox == $config->get('trash_mbox')) { + $to_trash = $to_mbox == $config->get('trash_mbox'); + + // flag messages as read before moving them + if ($to_trash && $config->get('read_when_deleted')) { // don't flush cache (4th argument) - $this->set_flag($uids, 'SEEN', $fbox, true); + $this->set_flag($uids, 'SEEN', $from_mbox, true); } // move messages @@ -2665,8 +2704,8 @@ class rcube_imap $this->_clear_messagecount($to_mbox); } // moving failed - else if ($config->get('delete_always', false) && $tbox == $config->get('trash_mbox')) { - $moved = $this->delete_message($uids, $fbox); + else if ($to_trash && $config->get('delete_always', false)) { + $moved = $this->delete_message($uids, $from_mbox); } if ($moved) { @@ -2708,10 +2747,9 @@ class rcube_imap */ function copy_message($uids, $to_mbox, $from_mbox='') { - $fbox = $from_mbox; - $tbox = $to_mbox; - $to_mbox = $this->mod_mailbox($to_mbox); - $from_mbox = $from_mbox ? $this->mod_mailbox($from_mbox) : $this->mailbox; + if (!strlen($from_mbox)) { + $from_mbox = $this->mailbox; + } list($uids, $all_mode) = $this->_parse_uids($uids, $from_mbox); @@ -2721,9 +2759,9 @@ class rcube_imap } // make sure mailbox exists - if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox)) { - if (in_array($tbox, $this->default_folders)) - $this->create_mailbox($tbox, true); + if ($to_mbox != 'INBOX' && !$this->mailbox_exists($to_mbox)) { + if (in_array($to_mbox, $this->default_folders)) + $this->create_mailbox($to_mbox, true); else return false; } @@ -2742,13 +2780,16 @@ class rcube_imap /** * Mark messages as deleted and expunge mailbox * - * @param mixed $uids Message UIDs as array or comma-separated string, or '*' - * @param string $mbox_name Source mailbox + * @param mixed $uids Message UIDs as array or comma-separated string, or '*' + * @param string $mailbox Source mailbox + * * @return boolean True on success, False on error */ - function delete_message($uids, $mbox_name='') + function delete_message($uids, $mailbox='') { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } list($uids, $all_mode) = $this->_parse_uids($uids, $mailbox); @@ -2796,12 +2837,15 @@ class rcube_imap /** * Clear all messages in a specific mailbox * - * @param string $mbox_name Mailbox name + * @param string $mailbox Mailbox name + * * @return int Above 0 on success */ - function clear_mailbox($mbox_name=NULL) + function clear_mailbox($mailbox=null) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } // SELECT will set messages count for clearFolder() if ($this->conn->select($mailbox)) { @@ -2823,13 +2867,17 @@ class rcube_imap /** * Send IMAP expunge command and clear cache * - * @param string $mbox_name Mailbox name + * @param string $mailbox Mailbox name * @param boolean $clear_cache False if cache should not be cleared + * * @return boolean True on success */ - function expunge($mbox_name='', $clear_cache=true) + function expunge($mailbox='', $clear_cache=true) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } + return $this->_expunge($mailbox, $clear_cache); } @@ -2924,13 +2972,17 @@ class rcube_imap /** * Translate UID to message ID * - * @param int $uid Message UID - * @param string $mbox_name Mailbox name + * @param int $uid Message UID + * @param string $mailbox Mailbox name + * * @return int Message ID */ - function get_id($uid, $mbox_name=NULL) + function get_id($uid, $mailbox=null) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } + return $this->_uid2id($uid, $mailbox); } @@ -2938,13 +2990,17 @@ class rcube_imap /** * Translate message number to UID * - * @param int $id Message ID - * @param string $mbox_name Mailbox name + * @param int $id Message ID + * @param string $mailbox Mailbox name + * * @return int Message UID */ - function get_uid($id, $mbox_name=NULL) + function get_uid($id, $mailbox=null) { - $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } + return $this->_id2uid($id, $mailbox); } @@ -2957,32 +3013,24 @@ class rcube_imap /** * Public method for listing subscribed folders * - * Converts mailbox name with root dir first - * * @param string $root Optional root folder * @param string $filter Optional filter for mailbox listing + * * @return array List of mailboxes/folders * @access public */ function list_mailboxes($root='', $filter='*') { - $a_out = array(); $a_mboxes = $this->_list_mailboxes($root, $filter); - foreach ($a_mboxes as $idx => $mbox_row) { - if (strlen($name = $this->mod_mailbox($mbox_row, 'out'))) - $a_out[] = $name; - unset($a_mboxes[$idx]); - } - // INBOX should always be available - if (!in_array('INBOX', $a_out)) - array_unshift($a_out, 'INBOX'); + if (!in_array('INBOX', $a_mboxes)) + array_unshift($a_mboxes, 'INBOX'); // sort mailboxes - $a_out = $this->_sort_mailbox_list($a_out); + $a_mboxes = $this->_sort_mailbox_list($a_mboxes); - return $a_out; + return $a_mboxes; } @@ -3017,7 +3065,7 @@ class rcube_imap // #1486225: Some dovecot versions returns wrong result using LIST-EXTENDED if (!$config->get('imap_force_lsub') && $this->get_capability('LIST-EXTENDED')) { // This will also set mailbox options, LSUB doesn't do that - $a_folders = $this->conn->listMailboxes($this->mod_mailbox($root), $filter, + $a_folders = $this->conn->listMailboxes($root, $filter, NULL, array('SUBSCRIBED')); // remove non-existent folders @@ -3033,7 +3081,7 @@ class rcube_imap } // retrieve list of folders from IMAP server using LSUB else { - $a_folders = $this->conn->listSubscribed($this->mod_mailbox($root), $filter); + $a_folders = $this->conn->listSubscribed($root, $filter); } } @@ -3065,27 +3113,21 @@ class rcube_imap } else { // retrieve list of folders from IMAP server - $a_mboxes = $this->conn->listMailboxes($this->mod_mailbox($root), $filter); + $a_mboxes = $this->conn->listMailboxes($root, $filter); } - $a_folders = array(); - if (!is_array($a_mboxes)) + if (!is_array($a_mboxes)) { $a_mboxes = array(); - - // modify names with root dir - foreach ($a_mboxes as $idx => $mbox_name) { - if (strlen($name = $this->mod_mailbox($mbox_name, 'out'))) - $a_folders[] = $name; - unset($a_mboxes[$idx]); } // INBOX should always be available - if (!in_array('INBOX', $a_folders)) - array_unshift($a_folders, 'INBOX'); + if (!in_array('INBOX', $a_mboxes)) + array_unshift($a_mboxes, 'INBOX'); // filter folders and sort them - $a_folders = $this->_sort_mailbox_list($a_folders); - return $a_folders; + $a_mboxes = $this->_sort_mailbox_list($a_mboxes); + + return $a_mboxes; } @@ -3107,15 +3149,14 @@ class rcube_imap /** * Get mailbox size (size of all messages in a mailbox) * - * @param string $name Mailbox name + * @param string $mailbox Mailbox name + * * @return int Mailbox size in bytes, False on error */ - function get_mailbox_size($name) + function get_mailbox_size($mailbox) { - $name = $this->mod_mailbox($name); - // @TODO: could we try to use QUOTA here? - $result = $this->conn->fetchHeaderIndex($name, '1:*', 'SIZE', false); + $result = $this->conn->fetchHeaderIndex($mailbox, '1:*', 'SIZE', false); if (is_array($result)) $result = array_sum($result); @@ -3159,19 +3200,18 @@ class rcube_imap /** * Create a new mailbox on the server and register it in local cache * - * @param string $name New mailbox name + * @param string $mailbox New mailbox name * @param boolean $subscribe True if the new mailbox should be subscribed - * @param boolean True on success + * + * @return boolean True on success */ - function create_mailbox($name, $subscribe=false) + function create_mailbox($mailbox, $subscribe=false) { - $result = false; - $abs_name = $this->mod_mailbox($name); - $result = $this->conn->createFolder($abs_name); + $result = $this->conn->createFolder($mailbox); // try to subscribe it if ($result && $subscribe) - $this->subscribe($name); + $this->subscribe($mailbox); return $result; } @@ -3180,38 +3220,36 @@ class rcube_imap /** * Set a new name to an existing mailbox * - * @param string $mbox_name Mailbox to rename - * @param string $new_name New mailbox name + * @param string $mailbox Mailbox to rename + * @param string $new_name New mailbox name * * @return boolean True on success */ - function rename_mailbox($mbox_name, $new_name) + function rename_mailbox($mailbox, $new_name) { - $result = false; + if (!strlen($new_name)) { + return false; + } - // make absolute path - $mailbox = $this->mod_mailbox($mbox_name); - $abs_name = $this->mod_mailbox($new_name); - $delm = $this->get_hierarchy_delimiter(); + $delm = $this->get_hierarchy_delimiter(); // get list of subscribed folders if ((strpos($mailbox, '%') === false) && (strpos($mailbox, '*') === false)) { - $a_subscribed = $this->_list_mailboxes('', $mbox_name . $delm . '*'); - $subscribed = $this->mailbox_exists($mbox_name, true); + $a_subscribed = $this->_list_mailboxes('', $mailbox . $delm . '*'); + $subscribed = $this->mailbox_exists($mailbox, true); } else { $a_subscribed = $this->_list_mailboxes(); $subscribed = in_array($mailbox, $a_subscribed); } - if (strlen($abs_name)) - $result = $this->conn->renameFolder($mailbox, $abs_name); + $result = $this->conn->renameFolder($mailbox, $new_name); if ($result) { // unsubscribe the old folder, subscribe the new one if ($subscribed) { $this->conn->unsubscribe($mailbox); - $this->conn->subscribe($abs_name); + $this->conn->subscribe($new_name); } // check if mailbox children are subscribed @@ -3219,7 +3257,7 @@ class rcube_imap if (preg_match('/^'.preg_quote($mailbox.$delm, '/').'/', $c_subscribed)) { $this->conn->unsubscribe($c_subscribed); $this->conn->subscribe(preg_replace('/^'.preg_quote($mailbox, '/').'/', - $abs_name, $c_subscribed)); + $new_name, $c_subscribed)); } } @@ -3235,15 +3273,13 @@ class rcube_imap /** * Remove mailbox from server * - * @param string $mbox_name Mailbox name + * @param string $mailbox Mailbox name * * @return boolean True on success */ - function delete_mailbox($mbox_name) + function delete_mailbox($mailbox) { - $result = false; - $mailbox = $this->mod_mailbox($mbox_name); - $delm = $this->get_hierarchy_delimiter(); + $delm = $this->get_hierarchy_delimiter(); // get list of folders if ((strpos($mailbox, '%') === false) && (strpos($mailbox, '*') === false)) @@ -3294,30 +3330,31 @@ class rcube_imap /** * Checks if folder exists and is subscribed * - * @param string $mbox_name Folder name + * @param string $mailbox Folder name * @param boolean $subscription Enable subscription checking + * * @return boolean TRUE or FALSE */ - function mailbox_exists($mbox_name, $subscription=false) + function mailbox_exists($mailbox, $subscription=false) { - if ($mbox_name == 'INBOX') + if ($mailbox == 'INBOX') { return true; + } $key = $subscription ? 'subscribed' : 'existing'; - $mbox = $this->mod_mailbox($mbox_name); - if (is_array($this->icache[$key]) && in_array($mbox, $this->icache[$key])) + if (is_array($this->icache[$key]) && in_array($mailbox, $this->icache[$key])) return true; if ($subscription) { - $a_folders = $this->conn->listSubscribed('', $mbox); + $a_folders = $this->conn->listSubscribed('', $mailbox); } else { - $a_folders = $this->conn->listMailboxes('', $mbox); + $a_folders = $this->conn->listMailboxes('', $mailbox); } - if (is_array($a_folders) && in_array($mbox, $a_folders)) { - $this->icache[$key][] = $mbox; + if (is_array($a_folders) && in_array($mailbox, $a_folders)) { + $this->icache[$key][] = $mailbox; return true; } @@ -3328,14 +3365,14 @@ class rcube_imap /** * Returns the namespace where the folder is in * - * @param string $mbox_name Folder name + * @param string $mailbox Folder name * * @return string One of 'personal', 'other' or 'shared' * @access public */ - function mailbox_namespace($mbox_name) + function mailbox_namespace($mailbox) { - if ($mbox_name == 'INBOX') { + if ($mailbox == 'INBOX') { return 'personal'; } @@ -3343,8 +3380,8 @@ class rcube_imap if (is_array($namespace)) { foreach ($namespace as $ns) { if (strlen($ns[0])) { - if ((strlen($ns[0])>1 && $mbox_name == substr($ns[0], 0, -1)) - || strpos($mbox_name, $ns[0]) === 0 + if ((strlen($ns[0])>1 && $mailbox == substr($ns[0], 0, -1)) + || strpos($mailbox, $ns[0]) === 0 ) { return $type; } @@ -3358,87 +3395,69 @@ class rcube_imap /** - * Modify folder name for input/output according to root dir and namespace + * Modify folder name according to namespace. + * For output it removes prefix of the personal namespace if it's possible. + * For input it adds the prefix. Use it before creating a folder in root + * of the folders tree. + * + * @param string $mailbox Folder name + * @param string $mode Mode name (out/in) * - * @param string $mbox_name Folder name - * @param string $mode Mode * @return string Folder name */ - function mod_mailbox($mbox_name, $mode='in') + function mod_mailbox($mailbox, $mode = 'out') { - if (!strlen($mbox_name)) - return ''; + if (!strlen($mailbox)) { + return $mailbox; + } - if ($mode == 'in') { - // If folder contains namespace prefix, don't modify it - if (is_array($this->namespace['shared'])) { - foreach ($this->namespace['shared'] as $ns) { - if ($ns[0] && strpos($mbox_name, $ns[0]) === 0) { - return $mbox_name; - } - } - } - if (is_array($this->namespace['other'])) { - foreach ($this->namespace['other'] as $ns) { - if ($ns[0] && strpos($mbox_name, $ns[0]) === 0) { - return $mbox_name; - } - } - } - if (is_array($this->namespace['personal'])) { - foreach ($this->namespace['personal'] as $ns) { - if ($ns[0] && strpos($mbox_name, $ns[0]) === 0) { - return $mbox_name; - } - } - // Add prefix if first personal namespace is non-empty - if ($mbox_name != 'INBOX' && $this->namespace['personal'][0][0]) { - return $this->namespace['personal'][0][0].$mbox_name; - } + $prefix = $this->namespace['prefix']; // see set_env() + $prefix_len = strlen($prefix); + + if (!$prefix_len) { + return $mailbox; + } + + // remove prefix for output + if ($mode == 'out') { + if (substr($mailbox, 0, $prefix_len) === $prefix) { + return substr($mailbox, $prefix_len); } } + // add prefix for input (e.g. folder creation) else { - // Remove prefix if folder is from first ("non-empty") personal namespace - if (is_array($this->namespace['personal'])) { - if ($prefix = $this->namespace['personal'][0][0]) { - if (strpos($mbox_name, $prefix) === 0) { - return substr($mbox_name, strlen($prefix)); - } - } - } + return $prefix . $mailbox; } - return $mbox_name; + return $mailbox; } /** * Gets folder options from LIST response, e.g. \Noselect, \Noinferiors * - * @param string $mbox_name Folder name - * @param bool $force Set to True if options should be refreshed - * Options are available after LIST command only + * @param string $mailbox Folder name + * @param bool $force Set to True if options should be refreshed + * Options are available after LIST command only * * @return array Options list */ - function mailbox_options($mbox_name, $force=false) + function mailbox_options($mailbox, $force=false) { - $mbox = $this->mod_mailbox($mbox_name); - - if ($mbox == 'INBOX') { + if ($mailbox == 'INBOX') { return array(); } - if (!is_array($this->conn->data['LIST']) || !is_array($this->conn->data['LIST'][$mbox])) { + if (!is_array($this->conn->data['LIST']) || !is_array($this->conn->data['LIST'][$mailbox])) { if ($force) { - $this->conn->listMailboxes('', $mbox_name); + $this->conn->listMailboxes('', $mailbox); } else { return array(); } } - $opts = $this->conn->data['LIST'][$mbox]; + $opts = $this->conn->data['LIST'][$mailbox]; return is_array($opts) ? $opts : array(); } @@ -3479,8 +3498,6 @@ class rcube_imap */ function set_acl($mailbox, $user, $acl) { - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('ACL')) return $this->conn->setACL($mailbox, $user, $acl); @@ -3503,8 +3520,6 @@ class rcube_imap */ function delete_acl($mailbox, $user) { - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('ACL')) return $this->conn->deleteACL($mailbox, $user); @@ -3523,8 +3538,6 @@ class rcube_imap */ function get_acl($mailbox) { - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('ACL')) return $this->conn->getACL($mailbox); @@ -3545,8 +3558,6 @@ class rcube_imap */ function list_rights($mailbox, $user) { - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('ACL')) return $this->conn->listRights($mailbox, $user); @@ -3566,8 +3577,6 @@ class rcube_imap */ function my_rights($mailbox) { - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('ACL')) return $this->conn->myRights($mailbox); @@ -3587,9 +3596,6 @@ class rcube_imap */ function set_metadata($mailbox, $entries) { - if ($mailbox) - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('METADATA') || (!strlen($mailbox) && $this->get_capability('METADATA-SERVER')) ) { @@ -3620,9 +3626,6 @@ class rcube_imap */ function delete_metadata($mailbox, $entries) { - if ($mailbox) - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('METADATA') || (!strlen($mailbox) && $this->get_capability('METADATA-SERVER')) ) { @@ -3654,9 +3657,6 @@ class rcube_imap */ function get_metadata($mailbox, $entries, $options=array()) { - if ($mailbox) - $mailbox = $this->mod_mailbox($mailbox); - if ($this->get_capability('METADATA') || !strlen(($mailbox) && $this->get_capability('METADATA-SERVER')) ) { @@ -4597,45 +4597,50 @@ class rcube_imap /** - * @param int $uid Message UID - * @param string $mbox_name Mailbox name + * @param int $uid Message UID + * @param string $mailbox Mailbox name * @return int Message (sequence) ID * @access private */ - private function _uid2id($uid, $mbox_name=NULL) + private function _uid2id($uid, $mailbox=NULL) { - if (!strlen($mbox_name)) - $mbox_name = $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } - if (!isset($this->uid_id_map[$mbox_name][$uid])) { - if (!($id = $this->get_cache_uid2id($mbox_name.'.msg', $uid))) - $id = $this->conn->UID2ID($mbox_name, $uid); + if (!isset($this->uid_id_map[$mailbox][$uid])) { + if (!($id = $this->get_cache_uid2id($mailbox.'.msg', $uid))) + $id = $this->conn->UID2ID($mailbox, $uid); - $this->uid_id_map[$mbox_name][$uid] = $id; + $this->uid_id_map[$mailbox][$uid] = $id; } - return $this->uid_id_map[$mbox_name][$uid]; + return $this->uid_id_map[$mailbox][$uid]; } /** - * @param int $id Message (sequence) ID - * @param string $mbox_name Mailbox name + * @param int $id Message (sequence) ID + * @param string $mailbox Mailbox name + * * @return int Message UID * @access private */ - private function _id2uid($id, $mbox_name=NULL) + private function _id2uid($id, $mailbox=null) { - if (!strlen($mbox_name)) - $mbox_name = $this->mailbox; + if (!strlen($mailbox)) { + $mailbox = $this->mailbox; + } - if ($uid = array_search($id, (array)$this->uid_id_map[$mbox_name])) + if ($uid = array_search($id, (array)$this->uid_id_map[$mailbox])) { return $uid; + } - if (!($uid = $this->get_cache_id2uid($mbox_name.'.msg', $id))) - $uid = $this->conn->ID2UID($mbox_name, $id); + if (!($uid = $this->get_cache_id2uid($mailbox.'.msg', $id))) { + $uid = $this->conn->ID2UID($mailbox, $id); + } - $this->uid_id_map[$mbox_name][$uid] = $id; + $this->uid_id_map[$mailbox][$uid] = $id; return $uid; } @@ -4650,13 +4655,12 @@ class rcube_imap $updated = false; if (is_array($a_mboxes)) - foreach ($a_mboxes as $i => $mbox_name) { - $mailbox = $this->mod_mailbox($mbox_name); + foreach ($a_mboxes as $i => $mailbox) { $a_mboxes[$i] = $mailbox; - if ($mode=='subscribe') + if ($mode == 'subscribe') $updated = $this->conn->subscribe($mailbox); - else if ($mode=='unsubscribe') + else if ($mode == 'unsubscribe') $updated = $this->conn->unsubscribe($mailbox); } @@ -4667,9 +4671,9 @@ class rcube_imap return $updated; // modify cached list - if ($mode=='subscribe') + if ($mode == 'subscribe') $a_mailbox_cache = array_merge($a_mailbox_cache, $a_mboxes); - else if ($mode=='unsubscribe') + else if ($mode == 'unsubscribe') $a_mailbox_cache = array_diff($a_mailbox_cache, $a_mboxes); // write mailboxlist to cache @@ -4684,12 +4688,9 @@ class rcube_imap * Increde/decrese messagecount for a specific mailbox * @access private */ - private function _set_messagecount($mbox_name, $mode, $increment) + private function _set_messagecount($mailbox, $mode, $increment) { - $a_mailbox_cache = false; - $mailbox = strlen($mbox_name) ? $mbox_name : $this->mailbox; $mode = strtoupper($mode); - $a_mailbox_cache = $this->get_cache('messagecount'); if (!is_array($a_mailbox_cache[$mailbox]) || !isset($a_mailbox_cache[$mailbox][$mode]) || !is_numeric($increment)) @@ -4713,10 +4714,8 @@ class rcube_imap * Remove messagecount of a specific mailbox from cache * @access private */ - private function _clear_messagecount($mbox_name='', $mode=null) + private function _clear_messagecount($mailbox, $mode=null) { - $mailbox = strlen($mbox_name) ? $mbox_name : $this->mailbox; - $a_mailbox_cache = $this->get_cache('messagecount'); if (is_array($a_mailbox_cache[$mailbox])) { diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0f25ec765..889406b15 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -130,7 +130,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { 'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage', 'copy', 'move', 'quota'); - $OUTPUT->set_pagetitle(rcmail_localize_foldername($mbox_name)); + $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->mod_mailbox($mbox_name))); } diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc index 34dc064b5..c57ec69d7 100644 --- a/program/steps/settings/edit_folder.inc +++ b/program/steps/settings/edit_folder.inc @@ -54,6 +54,20 @@ function rcube_folder_form($attrib) else { $options = array(); $path = $parent_imap; + + // allow creating subfolders of INBOX folder + if ($path == 'INBOX') { + $path = $RCMAIL->imap->mod_mailbox($path, 'in'); + } + } + + // remove personal namespace prefix + if (strlen($path)) { + $path_id = $path; + $path = $RCMAIL->imap->mod_mailbox($path.$delimiter); + if ($path[strlen($path)-1] == $delimiter) { + $path = substr($path, 0, -1); + } } $form = array(); @@ -93,15 +107,15 @@ function rcube_folder_form($attrib) ); if (strlen($path)) { - if ($options['norename'] || $options['namespace'] != 'personal') { + if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) { // prevent user from moving folder $hidden_path = new html_hiddenfield(array('name' => '_parent', 'value' => $path)); $form['props']['fieldsets']['location']['content']['name']['value'] .= $hidden_path->show(); } else { $radio1 = new html_radiobutton(array('name' => '_parent', 'value' => '')); - $radio2 = new html_radiobutton(array('name' => '_parent', 'value' => $path)); - $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path; + $radio2 = new html_radiobutton(array('name' => '_parent', 'value' => $path_id)); + $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path_id; $html_path = str_replace($delimiter, ' » ', rcmail_localize_folderpath($path)); diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index a215d008b..c4c221fb5 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -126,12 +126,11 @@ else if ($RCMAIL->action == 'rename-folder') // subfolders for ($x=sizeof($folderlist)-1; $x>=0; $x--) { if (preg_match($regexp, $folderlist[$x])) { - $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]); - $foldersplit = explode($delimiter, $folderlist[$x]); - $level = count($foldersplit) - 1; + $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]); + $foldersplit = explode($delimiter, $IMAP->mod_mailbox($folderlist[$x])); + $level = count($foldersplit) - 1; $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'); - $before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF7-IMAP') : false; $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF7-IMAP'), @@ -139,14 +138,14 @@ else if ($RCMAIL->action == 'rename-folder') } } + $index = array_search($name, $folderlist); + $name = $IMAP->mod_mailbox($name); $foldersplit = explode($delimiter, $name); - $level = count($foldersplit) - 1; + $level = count($foldersplit) - 1; $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'); - $index = array_search($name, $folderlist); - $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false; + $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false; - $OUTPUT->command('replace_folder_row', $oldname_utf8, - rcube_charset_convert($name, 'UTF7-IMAP'), $display_rename, $before); + $OUTPUT->command('replace_folder_row', $oldname_utf8, $name_utf8, $display_rename, $before); } else if (!$rename) { rcmail_display_server_error('errorsaving'); @@ -243,13 +242,15 @@ function rcube_subscription_form($attrib) // pre-process folders list foreach ($a_unsubscribed as $i => $folder) { - $foldersplit = explode($delimiter, $folder); - $name = rcube_charset_convert(array_pop($foldersplit), 'UTF7-IMAP'); + $folder_id = $folder; + $folder = $IMAP->mod_mailbox($folder); + $foldersplit = explode($delimiter, $folder); + $name = rcube_charset_convert(array_pop($foldersplit), 'UTF7-IMAP'); $parent_folder = join($delimiter, $foldersplit); - $level = count($foldersplit); + $level = count($foldersplit); // add any necessary "virtual" parent folders - if ($parent_folder && !$seen[$parent_folder]) { + if ($parent_folder && !isset($seen[$parent_folder])) { for ($i=1; $i<=$level; $i++) { $ancestor_folder = join($delimiter, array_slice($foldersplit, 0, $i)); if ($ancestor_folder && !$seen[$ancestor_folder]++) { @@ -263,11 +264,16 @@ function rcube_subscription_form($attrib) } } } - + + // Handle properly INBOX.INBOX situation + if (isset($seen[$folder])) { + continue; + } + $seen[$folder]++; $list_folders[] = array( - 'id' => $folder, + 'id' => $folder_id, 'name' => $name, 'level' => $level, ); @@ -354,11 +360,11 @@ function rcmail_rename_folder($oldname, $newname) foreach ($a_threaded as $key => $val) { if ($key == $oldname) { unset($a_threaded[$key]); - $a_threaded[$newname] = true; + $a_threaded[$newname] = true; } else if (preg_match($oldprefix, $key)) { unset($a_threaded[$key]); - $a_threaded[preg_replace($oldprefix, $newname.$delimiter, $key)] = true; + $a_threaded[preg_replace($oldprefix, $newname.$delimiter, $key)] = true; } } $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded)); diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc index 70aad6d82..c1120961b 100644 --- a/program/steps/settings/save_folder.inc +++ b/program/steps/settings/save_folder.inc @@ -65,6 +65,9 @@ else { else if (strlen($path)) { $name_imap = $path . $delimiter . $name_imap; } + else { + $name_imap = $RCMAIL->imap->mod_mailbox($name, 'in'); + } $folder['name'] = $name_imap; $folder['oldname'] = $old_imap; |