Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-12 19:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix "Empty startup greeting" bug (#1486085)

Browse Source
This commit is contained in:
alecpl
2009-09-20 09:09:36 +00:00
parent f8dae9f00f
commit 587444f657
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Fix "Empty startup greeting" bug (#1486085)
- Fix setting user name in 'new_user_identity' plugin (#1486137)
- Fix incorrect count of new messages in folder list when using multiple IMAP clients (#1485995)
- Fix all folders checking for new messages with disabled caching (#1486128)

8
program/lib/imap.inc
View File

@@ -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";