summaryrefslogtreecommitdiff
path: root/program/lib/imap.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-03-06 07:31:30 +0000
committeralecpl <alec@alec.pl>2009-03-06 07:31:30 +0000
commit25f779d2e90627f989da32dbd3cf7a0e3e3d2a3b (patch)
tree8c62bbda005ca2527b3ba104d1da2ed86bfe4b48 /program/lib/imap.inc
parent961afa19301fabfa65848242e896cc1e6a267f04 (diff)
- Fix errors handling in IMAP command continuations (#1485762)
Diffstat (limited to 'program/lib/imap.inc')
-rw-r--r--program/lib/imap.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 056632209..f50abeacd 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -220,6 +220,9 @@ function iil_PutLineC($fp, $string, $endln=true) {
if(preg_match('/^\{[0-9]+\}\r\n$/', $parts[$i+1])) {
$res += iil_PutLine($fp, $parts[$i].$parts[$i+1], false);
$line = iil_ReadLine($fp, 1000);
+ // handle error in command
+ if ($line[0] != '+')
+ return false;
$i++;
}
else
@@ -292,7 +295,7 @@ function iil_ReadReply($fp) {
}
function iil_ParseResult($string) {
- $a=explode(' ', $string);
+ $a = explode(' ', $string);
if (count($a) > 2) {
if (strcasecmp($a[1], 'OK') == 0) {
return 0;
@@ -2142,7 +2145,9 @@ function iil_C_Search(&$conn, $folder, $criteria) {
$c = 0;
$query = 'srch1 SEARCH ' . chop($criteria);
- iil_PutLineC($fp, $query);
+ if (!iil_PutLineC($fp, $query)) {
+ return false;
+ }
do {
$line=trim(iil_ReadLine($fp, 10000));
if (eregi("^\* SEARCH", $line)) {