From 4859fedb92b2ac0b3e717133c2ee32fa449ed06b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 07 Aug 2010 08:04:39 -0400
Subject: [PATCH] Fix unit tests + update version
---
program/include/rcube_imap_generic.php | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index cd6a58d..fcde08c 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -191,7 +191,7 @@
break;
}
if (!empty($this->prefs['debug_mode'])) {
- write_log('imap', 'S: '. chop($buffer));
+ write_log('imap', 'S: '. rtrim($buffer));
}
$line .= $buffer;
} while ($buffer[strlen($buffer)-1] != "\n");
@@ -201,7 +201,7 @@
private function multLine($line, $escape=false)
{
- $line = chop($line);
+ $line = rtrim($line);
if (preg_match('/\{[0-9]+\}$/', $line)) {
$out = '';
@@ -716,6 +716,7 @@
}
$this->getNamespace();
$this->logged = true;
+
return true;
} else {
return false;
@@ -748,7 +749,7 @@
if ($this->putLine("sel1 SELECT \"".$this->escape($mailbox).'"')) {
do {
- $line = chop($this->readLine(300));
+ $line = rtrim($this->readLine(300));
$a = explode(' ', $line);
if (count($a) == 3) {
$token = strtoupper($a[2]);
@@ -839,7 +840,7 @@
return false;
}
do {
- $line = chop($this->readLine());
+ $line = rtrim($this->readLine());
if ($this->startsWith($line, '* SORT')) {
$data .= substr($line, 7);
} else if (preg_match('/^[0-9 ]+$/', $line)) {
@@ -923,7 +924,7 @@
$result = array();
do {
- $line = chop($this->readLine(200));
+ $line = rtrim($this->readLine(200));
$line = $this->multLine($line);
if (preg_match('/^\* ([0-9]+) FETCH/', $line, $m)) {
@@ -1052,7 +1053,7 @@
$result = -1;
if ($this->putLine("fuid FETCH $id (UID)")) {
do {
- $line = chop($this->readLine(1024));
+ $line = rtrim($this->readLine(1024));
if (preg_match("/^\* $id FETCH \(UID (.*)\)/i", $line, $r)) {
$result = $r[1];
}
@@ -1110,10 +1111,8 @@
if (!$line)
break;
- $a = explode(' ', $line);
-
- if (($line[0] == '*') && ($a[2] == 'FETCH')) {
- $id = $a[1];
+ if (preg_match('/^\* ([0-9]+) FETCH/', $line, $m)) {
+ $id = $m[1];
$result[$id] = new rcube_mail_header;
$result[$id]->id = $id;
@@ -1187,7 +1186,7 @@
// to the next valid header line.
do {
- $line = chop($this->readLine(300), "\r\n");
+ $line = rtrim($this->readLine(300), "\r\n");
// The preg_match below works around communigate imap, which outputs " UID <number>)".
// Without this, the while statement continues on and gets the "FH0 OK completed" message.
@@ -1289,8 +1288,6 @@
break;
} // end switch ()
} // end while ()
- } else {
- $a = explode(' ', $line);
}
// process flags
@@ -1299,7 +1296,6 @@
$flags_a = explode(' ', $flags_str);
if (is_array($flags_a)) {
- // reset($flags_a);
foreach($flags_a as $flag) {
$flag = strtoupper($flag);
if ($flag == 'SEEN') {
@@ -1450,7 +1446,7 @@
}
do {
- $line = $this->readLine(1000);
+ $line = $this->readLine();
if ($line[0] == '*') {
$c++;
}
@@ -1606,7 +1602,7 @@
}
$data = '';
- $query = 'srch1 ' . ($return_uid ? 'UID ' : '') . 'SEARCH ' . chop($criteria);
+ $query = 'srch1 ' . ($return_uid ? 'UID ' : '') . 'SEARCH ' . trim($criteria);
if (!$this->putLineC($query)) {
return false;
@@ -1731,7 +1727,7 @@
}
do {
- $line = $this->readLine(1000);
+ $line = $this->readLine(1024);
$line = $this->multLine($line);
if (preg_match('/BODY\[([0-9\.]+)\.'.$type.'\]/', $line, $matches)) {
@@ -1775,12 +1771,11 @@
$mode = 0;
}
- $reply_key = '* ' . $id;
- $result = false;
-
// format request
- $key = 'ftch0';
- $request = $key . ($is_uid ? ' UID' : '') . " FETCH $id (BODY.PEEK[$part])";
+ $reply_key = '* ' . $id;
+ $key = 'ftch0';
+ $request = $key . ($is_uid ? ' UID' : '') . " FETCH $id (BODY.PEEK[$part])";
+
// send request
if (!$this->putLine($request)) {
return false;
@@ -1788,11 +1783,12 @@
// receive reply line
do {
- $line = chop($this->readLine(1000));
+ $line = rtrim($this->readLine(1024));
$a = explode(' ', $line);
} while (!($end = $this->startsWith($line, $key, true)) && $a[2] != 'FETCH');
- $len = strlen($line);
+ $len = strlen($line);
+ $result = false;
// handle empty "* X FETCH ()" response
if ($line[$len-1] == ')' && $line[$len-2] != '(') {
@@ -1888,7 +1884,7 @@
$line = $this->readLine(1024);
} while (!$this->startsWith($line, $key, true));
- if ($result) {
+ if ($result !== false) {
if ($file) {
fwrite($file, $result);
} else if ($print) {
@@ -2112,7 +2108,7 @@
// get line(s) containing quota info
if ($this->putLine('QUOT1 GETQUOTAROOT "INBOX"')) {
do {
- $line = chop($this->readLine(5000));
+ $line = rtrim($this->readLine(5000));
if ($this->startsWith($line, '* QUOTA ')) {
$quota_lines[] = $line;
}
@@ -2235,4 +2231,3 @@
}
-?>
--
Gitblit v1.9.1