From 587444f657dd6f1d64b2ea46374c253232bae879 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 20 Sep 2009 09:09:36 +0000
Subject: - Fix "Empty startup greeting" bug (#1486085)

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

(limited to 'program/lib/imap.inc')

diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index a57250141..04af1d029 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -612,7 +612,7 @@ function iil_Connect($host, $user, $password, $options=null) {
 		$host = $ICL_SSL . '://' . $host;
 	}
 
-	$conn->fp = fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
+	$conn->fp = @fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
 	if (!$conn->fp) {
     		$iil_error = "Could not connect to $host at port $ICL_PORT: $errstr";
     		$iil_errornum = -2;
@@ -620,7 +620,7 @@ function iil_Connect($host, $user, $password, $options=null) {
 	}
 
 	stream_set_timeout($conn->fp, 10);
-	$line = stream_get_line($conn->fp, 8192, "\n");
+	$line = trim(fgets($conn->fp, 8192));
 
 	if ($my_prefs['debug_mode'] && $line)
 		write_log('imap', 'S: '. $line);
@@ -640,7 +640,7 @@ function iil_Connect($host, $user, $password, $options=null) {
 		$conn->capability = explode(' ', strtoupper($matches[1]));
 	}
 
-	$conn->message .= $line;
+	$conn->message .= $line . "\n";
 
 	// TLS connection
 	if ($ICL_SSL == 'tls' && iil_C_GetCapability($conn, 'STARTTLS')) {
@@ -704,7 +704,7 @@ function iil_Connect($host, $user, $password, $options=null) {
 		}
 	}
 		
-	if ((!$result)||(strcasecmp($auth, "plain") == 0)) {
+	if (!$result || strcasecmp($auth, "plain") == 0) {
 		//do plain text auth
 		$result = iil_C_Login($conn, $user, $password);
 		$conn->message .= "Tried PLAIN: $result \n";
-- 
cgit v1.2.3