banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize SELECT response handling

Browse Source
pull/5241/head
Aleksander Machniak 9 years ago
parent 344b0af9c6
commit 4921c21cff
1 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File

78
program/lib/Roundcube/rcube_imap_generic.php
Unescape Escape View File

@ -1128,35 +1128,61 @@ class rcube_imap_generic
$response = explode("\r\n", $response); $response = explode("\r\n", $response);
foreach ($response as $line) { foreach ($response as $line) {
if (preg_match('/^\* ([0-9]+) (EXISTS|RECENT)$/i', $line, $m)) { if (preg_match('/^\* OK \[/i', $line)) {
$this->data[strtoupper($m[2])] = (int) $m[1]; $pos = strcspn($line, ' ]', 6);
} $token = strtoupper(substr($line, 6, $pos));
else if (preg_match('/^\* OK \[/i', $line, $match)) { $pos += 7;
$line = substr($line, 6);
if (preg_match('/^(UIDNEXT|UIDVALIDITY|UNSEEN) ([0-9]+)/i', $line, $match)) { switch ($token) {
$this->data[strtoupper($match[1])] = (int) $match[2]; case 'UIDNEXT':
} case 'UIDVALIDITY':
else if (preg_match('/^(HIGHESTMODSEQ) ([0-9]+)/i', $line, $match)) { case 'UNSEEN':
$this->data[strtoupper($match[1])] = (string) $match[2]; if ($len = strspn($line, '0123456789', $pos)) {
} $this->data[$token] = (int) substr($line, $pos, $len);
else if (preg_match('/^(NOMODSEQ)/i', $line, $match)) { }
$this->data[strtoupper($match[1])] = true; break;
}
else if (preg_match('/^PERMANENTFLAGS \(([^\)]+)\)/iU', $line, $match)) { case 'HIGHESTMODSEQ':
$this->data['PERMANENTFLAGS'] = explode(' ', $match[1]); if ($len = strspn($line, '0123456789', $pos)) {
$this->data[$token] = (string) substr($line, $pos, $len);
}
break;
case 'NOMODSEQ':
$this->data[$token] = true;
break;
case 'PERMANENTFLAGS':
$start = strpos($line, '(', $pos);
$end = strrpos($line, ')');
if ($start && $end) {
$flags = substr($line, $start + 1, $end - $start - 1);
$this->data[$token] = explode(' ', $flags);
}
break;
} }
} }
// QRESYNC FETCH response (RFC5162) else if (preg_match('/^\* ([0-9]+) (EXISTS|RECENT|FETCH)/i', $line, $match)) {
else if (preg_match('/^\* ([0-9+]) FETCH/i', $line, $match)) { $token = strtoupper($match[2]);
$line = substr($line, strlen($match[0])); switch ($token) {
$fetch_data = $this->tokenizeResponse($line, 1); case 'EXISTS':
$data = array('id' => $match[1]); case 'RECENT':
$this->data[$token] = (int) $match[1];
for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) { break;
$data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
}
$this->data['QRESYNC'][$data['uid']] = $data; case 'FETCH':
// QRESYNC FETCH response (RFC5162)
$line = substr($line, strlen($match[0]));
$fetch_data = $this->tokenizeResponse($line, 1);
$data = array('id' => $match[1]);
for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
$data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
}
$this->data['QRESYNC'][$data['uid']] = $data;
break;
}
} }
// QRESYNC VANISHED response (RFC5162) // QRESYNC VANISHED response (RFC5162)
else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) { else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {

Write Preview
Loading…
Cancel
Save