Changeset 4041 in subversion

Timestamp:

Oct 5, 2010 3:14:57 PM (3 years ago)

Author:

alec

Message:

• Fix handling of backslash as IMAP delimiter

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap_generic.php (modified) (8 diffs)

trunk/roundcubemail/CHANGELOG

@@ -22 +22 @@
 - Fix confirmation message isn't displayed after sending mail on Chrome (#1486177)
 - Fix keyboard doesn't work with autocomplete list with Chrome (#1487029)
+- Fix handling of backslash as IMAP delimiter
 
 RELEASE 0.4.1

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -424 +424 @@
             }
 
-        if (!$this->getCapability('NAMESPACE')) {
-                return false;
-            }
-
-            if (!$this->putLine("ns1 NAMESPACE")) {
-            return false;
-        }
-            do {
-                    $line = $this->readLine(1024);
-                    if (preg_match('/^\* NAMESPACE/', $line)) {
-                            $i    = 0;
-                            $line = $this->unEscape($line);
-                            $data = $this->parseNamespace(substr($line,11), $i, 0, 0);
-                    }
-            } while (!$this->startsWith($line, 'ns1', true, true));
-
-            if (!is_array($data)) {
+            if (!is_array($data = $this->_namespace())) {
                 return false;
             }
@@ -489 +473 @@
 
             do {
-                    $line = $this->readLine(500);
-                    if ($line[0] == '*') {
-                            $line = rtrim($line);
-                            $a = rcube_explode_quoted_string(' ', $this->unEscape($line));
-                            if ($a[0] == '*') {
-                                $delimiter = str_replace('"', '', $a[count($a)-2]);
-                        }
+                    $line = $this->readLine(1024);
+                    if (preg_match('/^\* LIST \([^\)]*\) "*([^"]+)"* ""/', $line, $m)) {
+                $delimiter = $this->unEscape($m[1]);
                     }
             } while (!$this->startsWith($line, 'ghd', true, true));
@@ -505 +485 @@
             // if that fails, try namespace extension
             // try to fetch namespace data
+            if (!is_array($data = $this->_namespace())) {
+            return false;
+        }
+
+            // extract user space data (opposed to global/shared space)
+            $user_space_data = $data[0];
+            if (!is_array($user_space_data)) {
+                return false;
+            }
+
+            // get first element
+            $first_userspace = $user_space_data[0];
+            if (!is_array($first_userspace)) {
+                return false;
+            }
+
+            // extract delimiter
+            $delimiter = $first_userspace[1];
+
+            return $delimiter;
+    }
+
+    function _namespace()
+    {
+        if (!$this->getCapability('NAMESPACE')) {
+                return false;
+            }
+
             if (!$this->putLine("ns1 NAMESPACE")) {
             return false;
@@ -513 +521 @@
                     if (preg_match('/^\* NAMESPACE/', $line)) {
                             $i = 0;
-                            $line = $this->unEscape($line);
                             $data = $this->parseNamespace(substr($line,11), $i, 0, 0);
                     }
@@ -522 +529 @@
             }
 
-            // extract user space data (opposed to global/shared space)
-            $user_space_data = $data[0];
-            if (!is_array($user_space_data)) {
-                return false;
-            }
-
-            // get first element
-            $first_userspace = $user_space_data[0];
-            if (!is_array($first_userspace)) {
-                return false;
-            }
-
-            // extract delimiter
-            $delimiter = $first_userspace[1];
-
-            return $delimiter;
+        return $data;
     }
 
@@ -1658 +1650 @@
                             $folders[] = preg_replace(array('/^"/', '/"$/'), '', $this->unEscape($m[3]));
                         // attributes
-//                      $attrib = explode(' ', $m[1]);
+//                      $attrib = explode(' ', $this->unEscape($m[1]));
                         // delimiter
-//                      $delim = $m[2];
+//                      $delim = $this->unEscape($m[2]);
                     }
             } while (!$this->startsWith($line, $key, true));
@@ -2171 +2163 @@
             $elem      = 0;
 
-        for ($i;$i<$len;$i++) {
+        for ($i; $i<$len; $i++) {
                     $c = (string)$str[$i];
                     if ($c == '(' && !$in_quotes) {
@@ -2182 +2174 @@
                             $i++;
                             if ($in_quotes) {
-                                    $data[$elem] .= $c.$str[$i];
+                                    $data[$elem] .= $str[$i];
                         }
                     } else if ($c == '"') {