summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2007-03-23 18:54:39 +0000
committerthomascube <thomas@roundcube.net>2007-03-23 18:54:39 +0000
commit28bfe4dc80a1431655666cfb3cec30f89e3459c7 (patch)
tree56e074bc2a86456cdd1fb94ec5ec550cffdeab24
parent8451fa4eb65976669bcfd345024e912067308795 (diff)
Fixed bugs #1484276 and #1484300
-rw-r--r--CHANGELOG6
-rw-r--r--program/include/rcube_imap.inc6
-rw-r--r--program/steps/mail/func.inc8
3 files changed, 13 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dd63ce85b..ab5980e61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
CHANGELOG RoundCube Webmail
---------------------------
+2007/03/23 (thomasb)
+----------
+- Correctly translate mailbox names (closes #1484276)
+- Quote e-mail address links (closes #1484300)
+
+
2007/03/21 (thomasb)
----------
- Updated PEAR::Mail_mime package
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 438922b0a..d4235fac4 100644
--- a/program/include/rcube_imap.inc
+++ b/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/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 1b98f1d52..37c1e1e19 100644
--- a/program/steps/mail/func.inc
+++ b/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('&lt;%s&gt;', $part['mailto']);
+ $out .= (strlen($out) ? ' ' : '') . sprintf('&lt;%s&gt;', Q($part['mailto']));
}
if ($c>$j)