From 16ce146d8881410618521ec676cb8e39252bb833 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 2 May 2014 19:35:54 +0200
Subject: Fix IMAP connection test in installer so it is aware of
 imap_auth_type (#1489746)

---
 CHANGELOG          | 1 +
 installer/test.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3b605f0e3..4f9f70060 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ CHANGELOG Roundcube Webmail
 - Fix too small length of users.preferences column data type on MySQL
 - Fix redundant warning when switching from html to text in empty editor (#1489819)
 - Fix invalid host validation on login (#1489841)
+- Fix IMAP connection test in installer so it is aware of imap_auth_type (#1489746)
 
 RELEASE 1.0.0
 -------------
diff --git a/installer/test.php b/installer/test.php
index 40b052bdc..5d5968e69 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -425,6 +425,11 @@ if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user
   $imap_user = idn_to_ascii($_POST['_user']);
 
   $imap = new rcube_imap(null);
+  $imap->set_options(array(
+    'auth_type' => $RCI->getprop('imap_auth_type'),
+    'debug'     => $RCI->getprop('imap_debug'),
+  ));
+
   if ($imap->connect($imap_host, $imap_user, $_POST['_pass'], $imap_port, $imap_ssl)) {
     $RCI->pass('IMAP connect', 'SORT capability: ' . ($imap->get_capability('SORT') ? 'yes' : 'no'));
     $imap->close();
-- 
cgit v1.2.3