diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-06-16 14:13:58 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-09-01 14:24:36 +0200 |
| commit | 3b55da7ba60bafaae5b20e0e39a3d6304001d08a (patch) | |
| tree | f4cf6614a69702d0a02dfc9e82dc4746cf4f8d4d /program/lib/Roundcube/rcube.php | |
| parent | 4922ebda5c08c5da31fd33682b8cc569b8293e62 (diff) | |
Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
Conflicts:
CHANGELOG
Diffstat (limited to 'program/lib/Roundcube/rcube.php')
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 87103be93..8f39c7a70 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -373,15 +373,16 @@ class rcube // set class options $options = array( - 'auth_type' => $this->config->get("{$driver}_auth_type", 'check'), - 'auth_cid' => $this->config->get("{$driver}_auth_cid"), - 'auth_pw' => $this->config->get("{$driver}_auth_pw"), - 'debug' => (bool) $this->config->get("{$driver}_debug"), - 'force_caps' => (bool) $this->config->get("{$driver}_force_caps"), - 'disabled_caps' => $this->config->get("{$driver}_disabled_caps"), - 'timeout' => (int) $this->config->get("{$driver}_timeout"), - 'skip_deleted' => (bool) $this->config->get('skip_deleted'), - 'driver' => $driver, + 'auth_type' => $this->config->get("{$driver}_auth_type", 'check'), + 'auth_cid' => $this->config->get("{$driver}_auth_cid"), + 'auth_pw' => $this->config->get("{$driver}_auth_pw"), + 'debug' => (bool) $this->config->get("{$driver}_debug"), + 'force_caps' => (bool) $this->config->get("{$driver}_force_caps"), + 'disabled_caps' => $this->config->get("{$driver}_disabled_caps"), + 'socket_options' => $this->config->get("{$driver}_conn_options"), + 'timeout' => (int) $this->config->get("{$driver}_timeout"), + 'skip_deleted' => (bool) $this->config->get('skip_deleted'), + 'driver' => $driver, ); if (!empty($_SESSION['storage_host'])) { |