diff options
| author | thomascube <thomas@roundcube.net> | 2008-02-08 17:18:32 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2008-02-08 17:18:32 +0000 |
| commit | 5bc0ab10fc24d22c422517abd0a9eaa0be31f529 (patch) | |
| tree | 976db5f2c9c97de41163879824d1f93bc167eaf4 /program/include/rcube_imap.inc | |
| parent | 320e15b32fc65b18cf571c3f25902482f0ec6eeb (diff) | |
Distinguish ssl and tls for imap connections (#1484667)
Diffstat (limited to 'program/include/rcube_imap.inc')
| -rw-r--r-- | program/include/rcube_imap.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc index 1f94adcd1..f7584041a 100644 --- a/program/include/rcube_imap.inc +++ b/program/include/rcube_imap.inc @@ -97,17 +97,17 @@ class rcube_imap * @param string Username for IMAP account * @param string Password for IMAP account * @param number Port to connect to - * @param boolean Use SSL connection + * @param string SSL schema (either ssl or tls) or null if plain connection * @return boolean TRUE on success, FALSE on failure * @access public */ - function connect($host, $user, $pass, $port=143, $use_ssl=FALSE) + function connect($host, $user, $pass, $port=143, $use_ssl=null) { global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE; // check for Open-SSL support in PHP build if ($use_ssl && in_array('openssl', get_loaded_extensions())) - $ICL_SSL = TRUE; + $ICL_SSL = $use_ssl == 'imaps' ? 'ssl' : $use_ssl; else if ($use_ssl) { raise_error(array('code' => 403, 'type' => 'imap', 'file' => __FILE__, |