From b026c3be85cb5617176e1408e2281bea4182e060 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 15 May 2008 21:21:35 +0000
Subject: Make IMAP auth type configurable (#1483825)

---
 CHANGELOG                      | 9 +++++++++
 config/main.inc.php.dist       | 3 +++
 program/include/rcube_imap.php | 6 ++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index debf9cffa..5fddd131a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,13 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/05/15 (thomasb)
+----------
+- Make IMAP auth type configurable (#1483825)
+- Fix empty values with FROM_UNIXTIME() in rcube_mdb2 (#1485055)
+
 2008/05/15 (alec)
+----------
 - Fix attachment list on IE 6/7 (#1484807)
 
 2008/05/12 (estadtherr)
@@ -9,12 +15,15 @@ CHANGELOG RoundCube Webmail
 - fix JavaScript in compose.html that shows cc/bcc fields if populated
 
 2008/05/12 (alec)
+----------
 - Updated PEAR::DB package to version 1.7.13
 
 2008/05/10 (alec)
+----------
 - Make password input fields of type password in installer (#1484886)
 
 2008/05/09 (alec)
+----------
 - Don't call CAPABILITY if was recieved as server's optional response 
   on connect (RFC3501 [7.1]) 
 
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 670bee200..e4287de7d 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -40,6 +40,9 @@ $rcmail_config['default_host'] = '';
 // TCP port used for IMAP connections
 $rcmail_config['default_port'] = 143;
 
+// IMAP authentication type (auth, plain) or null to use best server supported one
+$rcmail_config['imap_auth_type'] = null;
+
 // Automatically add this domain to user names for login
 // Only for IMAP servers that require full e-mail addresses for login
 // Specify an array with 'host' => 'domain' values to support multiple hosts
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 8166fd69c..1bf59b8dd 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -118,8 +118,10 @@ class rcube_imap
 
     $ICL_PORT = $port;
     $IMAP_USE_INTERNAL_DATE = false;
+
+    $auth_type = rcmail::get_instance()->config->get('imap_auth_type', 'check');
     
-    $this->conn = iil_Connect($host, $user, $pass, array('imap' => 'check'));
+    $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type));
     $this->host = $host;
     $this->user = $user;
     $this->pass = $pass;
@@ -2367,7 +2369,7 @@ class rcube_imap
 
     // no encoding information, use fallback
     return rcube_charset_convert($input, 
-      !empty($fallback) ? $fallback : $GLOBALS['CONFIG']['default_charset']);
+      !empty($fallback) ? $fallback : rcmail::get_instance()->config->get('default_charset', 'ISO-8859-1'));
     }
 
 
-- 
cgit v1.2.3