D5070.1775388722.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5070.1775388722.diff
View Options

	diff --git a/lib/drivers/kolab/kolab_file_storage.php b/lib/drivers/kolab/kolab_file_storage.php
	--- a/lib/drivers/kolab/kolab_file_storage.php
	+++ b/lib/drivers/kolab/kolab_file_storage.php
	@@ -145,7 +145,7 @@
	private function select_host($username)
	{
	// Get IMAP host
	- $host = $this->rc->config->get('default_host');
	+ $host = $this->rc->config->get('imap_host', $rcube->config->get('default_host'));

	if (is_array($host)) {
	list($user, $domain) = explode('@', $username);
	@@ -187,11 +187,10 @@

	$login_lc = $this->rc->config->get('login_lc');
	$default_port = $this->rc->config->get('default_port', 143);
	+ $ssl = null;

	// parse $host
	$a_host = parse_url($host);
	- $port = null;
	- $ssl = null;
	if (!empty($a_host['host'])) {
	$host = $a_host['host'];
	$ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
	@@ -203,7 +202,7 @@
	}
	}

	- if (!$port) {
	+ if (empty($port)) {
	$port = $default_port;
	}