From 697cc52cff43176edb809a0cba723ca4a27ba47d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 14 Nov 2008 11:18:00 +0000
Subject: - fixes for status filter - don't call search second time if first
 call returns empty (array) result

---
 program/lib/imap.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'program/lib')

diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 8cbb0e02b..8704e78f5 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -941,9 +941,11 @@ function iil_C_Sort(&$conn, $mailbox, $field, $add='', $is_uid=FALSE,
 		}
 	} while (!iil_StartsWith($line, 's ', true));
 	
-	if (empty($data)) {
-		$conn->error = $line;
-		return false;
+	$result_code = iil_ParseResult($line);
+	
+	if ($result_code != 0) {
+                $conn->error = 'iil_C_Sort: ' . $line . "\n";
+                return false;
 	}
 	
 	$out = explode(' ',$data);
@@ -2116,7 +2118,7 @@ function iil_C_Search(&$conn, $folder, $criteria) {
 				$messages = explode(' ', $str);
 			}
 		} while (!iil_StartsWith($line, 'srch1', true));
-		
+
 		$result_code = iil_ParseResult($line);
 		if ($result_code == 0) {
 		    return $messages;
-- 
cgit v1.2.3