diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-03-23 18:54:39 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-03-23 18:54:39 +0000 |
| commit | c7228254119f84d7fde14e6b0e470f8f73f38952 (patch) | |
| tree | fc918dc48cab1da84413e49fed59abde9f2c16d6 /roundcubemail/program | |
| parent | 15f812fdc97ba65de506202262fd1749938bc8c6 (diff) | |
Fixed bugs #1484276 and #1484300
git-svn-id: https://svn.roundcube.net/trunk@519 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.inc | 6 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc index 438922b0a..d4235fac4 100644 --- a/roundcubemail/program/include/rcube_imap.inc +++ b/roundcubemail/program/include/rcube_imap.inc @@ -2272,7 +2272,7 @@ class rcube_imap function _mod_mailbox($mbox_name, $mode='in') { - if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX') + if (empty($mbox_name) || (!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX') return $mbox_name; if (!empty($this->root_dir) && $mode=='in') @@ -2309,12 +2309,12 @@ class rcube_imap function get_id($uid, $mbox_name=NULL) { - return $this->_uid2id($uid, $mbox_name); + return $this->_uid2id($uid, $this->_mod_mailbox($mbox_name)); } function get_uid($id,$mbox_name=NULL) { - return $this->_id2uid($id, $mbox_name); + return $this->_id2uid($id, $this->_mod_mailbox($mbox_name)); } function _uid2id($uid, $mbox_name=NULL) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 1b98f1d52..37c1e1e19 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -1398,10 +1398,10 @@ function rcmail_address_string($input, $max=NULL, $addicon=NULL) else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto'])) { $out .= sprintf('<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>', - $part['mailto'], + Q($part['mailto']), $JS_OBJECT_NAME, - $part['mailto'], - $part['mailto'], + JQ($part['mailto']), + Q($part['mailto']), Q($part['name'])); if ($addicon) @@ -1417,7 +1417,7 @@ function rcmail_address_string($input, $max=NULL, $addicon=NULL) if ($part['name']) $out .= Q($part['name']); if ($part['mailto']) - $out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', $part['mailto']); + $out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($part['mailto'])); } if ($c>$j) |