Changeset 3881 in subversion

Timestamp:

Aug 8, 2010 6:53:57 AM (3 years ago)

Author:

alec

Message:

• Improved performance of LIST/LSUB response parsing

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -1670 +1670 @@
         }
 
+        $ref = $this->escape($ref);
+        $mailbox = $this->escape($mailbox);
+
         // send command
-            if (!$this->putLine($key." ".$command." \"". $this->escape($ref) ."\" \"". $this->escape($mailbox) ."\"")) {
+            if (!$this->putLine($key." ".$command." \"". $ref ."\" \"". $mailbox ."\"")) {
                     $this->error = "Couldn't send $command command";
                 return false;
@@ -1680 +1683 @@
                     $line = $this->readLine(500);
                     $line = $this->multLine($line, true);
-                    $a    = explode(' ', $line);
-
-                    if (($line[0] == '*') && ($a[1] == $command)) {
-                            $line = rtrim($line);
-                        // split one line
-                            $a = rcube_explode_quoted_string(' ', $line);
-                        // last string is folder name
-                            $folders[] = preg_replace(array('/^"/', '/"$/'), '', $this->unEscape($a[count($a)-1]));
-                        // second from last is delimiter
-                        $delim = trim($a[count($a)-2], '"');
+                    $line = trim($line);
+
+                    if (preg_match('/^\* '.$command.' \(([^\)]*)\) "*([^"]+)"* (.*)$/', $line, $m)) {
+                        // folder name
+                            $folders[] = preg_replace(array('/^"/', '/"$/'), '', $this->unEscape($m[3]));
+                        // attributes
+//                      $attrib = explode(' ', $m[1]);
+                        // delimiter
+//                      $delim = $m[2];
                     }
             } while (!$this->startsWith($line, $key, true));