diff options
| -rw-r--r-- | config/main.inc.php.dist | 6 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_imap_generic.php | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index caa2ea881..20b8795e1 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -63,8 +63,8 @@ $rcmail_config['smtp_debug'] = false; // IMAP // ---------------------------------- -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts +// The mail host chosen to perform the log-in. +// Leave blank to show a textbox at login, give a list of hosts // to display a pulldown menu or set one host as string. // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// // Supported replacement variables: @@ -73,6 +73,8 @@ $rcmail_config['smtp_debug'] = false; // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen // For example %n = mail.domain.tld, %t = domain.tld +// WARNING: After hostname change update of mail_host column in users table is +// required to match old user data records with the new host. $rcmail_config['default_host'] = ''; // TCP port used for IMAP connections diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index 112e91350..59a444da7 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -753,12 +753,16 @@ class rcube_imap_generic $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']); if (!$this->fp) { + if (!$errstr) { + $errstr = "Unknown reason (fsockopen() function disabled?)"; + } $this->setError(self::ERROR_BAD, sprintf("Could not connect to %s:%d: %s", $host, $this->prefs['port'], $errstr)); return false; } - if ($this->prefs['timeout'] > 0) + if ($this->prefs['timeout'] > 0) { stream_set_timeout($this->fp, $this->prefs['timeout']); + } $line = trim(fgets($this->fp, 8192)); |