Changeset 28bfe4d in github

Timestamp:

Mar 23, 2007 2:54:39 PM (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:

6d09984

Parents:

8451fa4

Message:

Fixed bugs #1484276 and #1484300

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.inc (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (2 diffs)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2007/03/23 (thomasb)
+----------
+- Correctly translate mailbox names (closes #1484276)
+- Quote e-mail address links (closes #1484300)
+
 
 2007/03/21 (thomasb)

program/include/rcube_imap.inc

@@ -2273 +2273 @@
   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;
 
@@ -2310 +2310 @@
   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));
     }
 

program/steps/mail/func.inc

@@ -1399 +1399 @@
       {
       $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']));
                       
@@ -1418 +1418 @@
         $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']));
       }