Permalink
Browse files

Make IMAP auth type configurable (#1483825)

  • Loading branch information...
1 parent 405aba8 commit b026c3be85cb5617176e1408e2281bea4182e060 @thomascube thomascube committed May 15, 2008
Showing with 16 additions and 2 deletions.
  1. +9 −0 CHANGELOG
  2. +3 −0 config/main.inc.php.dist
  3. +4 −2 program/include/rcube_imap.php
View
@@ -1,20 +1,29 @@
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)
----------
- 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])
View
@@ -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
@@ -118,8 +118,10 @@ function connect($host, $user, $pass, $port=143, $use_ssl=null)
$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 @@ function decode_mime_string($input, $fallback=null)
// 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'));
}

0 comments on commit b026c3b

Please sign in to comment.