- Fixed imap test to non-default port when using ssl (#1488118)

release-0.7
alecpl 13 years ago
parent 373b112f34
commit 3be904be26

@ -385,15 +385,17 @@ if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user
echo '<p>Connecting to ' . Q($_POST['_host']) . '...<br />';
$a_host = parse_url($_POST['_host']);
$imap_host = trim($_POST['_host']);
$imap_port = $RCI->getprop('default_port');
$a_host = parse_url($imap_host);
if ($a_host['host']) {
$imap_host = $a_host['host'];
$imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
$imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
}
else {
$imap_host = trim($_POST['_host']);
$imap_port = $RCI->getprop('default_port');
if (isset($a_host['port']))
$imap_port = $a_host['port'];
else if ($imap_ssl && $imap_ssl != 'tls' && (!$imap_port || $imap_port == 143))
$imap_port = 993;
}
$imap_host = idn_to_ascii($imap_host);

Loading…
Cancel
Save