From 7f5b535d12e63ab73f850d8ad7afd5870dc4a943 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 08 Aug 2010 06:53:57 -0400
Subject: [PATCH] - Improved performance of LIST/LSUB response parsing
---
program/include/rcube_imap_generic.php | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index fcde08c..3a44b3b 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1669,8 +1669,11 @@
$command = 'LIST';
}
+ $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;
}
@@ -1679,16 +1682,15 @@
do {
$line = $this->readLine(500);
$line = $this->multLine($line, true);
- $a = explode(' ', $line);
+ $line = trim($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], '"');
+ 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));
--
Gitblit v1.9.1