diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-06-16 17:12:27 +0400 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-06-16 17:12:27 +0400 |
commit | b76f8e5e26f638ecbe5bdcb58b6792ce05dabd86 (patch) | |
tree | ed7ee1883477e77c7505572ccf6b6b5d56e22829 /plugins/managesieve/lib | |
parent | 23c00eee86f1a1af9fa74bc9daf30c8d33ba33f0 (diff) |
Added option to specify connection socket parameters - managesieve_conn_options
Diffstat (limited to 'plugins/managesieve/lib')
-rw-r--r-- | plugins/managesieve/lib/Roundcube/rcube_sieve.php | 5 | ||||
-rw-r--r-- | plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php index 3bd2978da..a8e29d77c 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve.php @@ -57,10 +57,11 @@ class rcube_sieve * @param boolean Enable/disable debugging * @param string Proxy authentication identifier * @param string Proxy authentication password + * @param array List of options to pass to stream_context_create(). */ public function __construct($username, $password='', $host='localhost', $port=2000, $auth_type=null, $usetls=true, $disabled=array(), $debug=false, - $auth_cid=null, $auth_pw=null) + $auth_cid=null, $auth_pw=null, $options=array()) { $this->sieve = new Net_Sieve(); @@ -68,7 +69,7 @@ class rcube_sieve $this->sieve->setDebug(true, array($this, 'debug_handler')); } - if (PEAR::isError($this->sieve->connect($host, $port, null, $usetls))) { + if (PEAR::isError($this->sieve->connect($host, $port, $options, $usetls))) { return $this->_set_error(SIEVE_ERROR_CONNECTION); } diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php index 9900f16b5..3e3b9becc 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php @@ -122,6 +122,7 @@ class rcube_sieve_engine 'debug' => $this->rc->config->get('managesieve_debug', false), 'auth_cid' => $this->rc->config->get('managesieve_auth_cid'), 'auth_pw' => $this->rc->config->get('managesieve_auth_pw'), + 'socket_options' => $this->rc->config->get('managesieve_conn_options'), )); // try to connect to managesieve server and to fetch the script @@ -135,7 +136,8 @@ class rcube_sieve_engine $plugin['disabled'], $plugin['debug'], $plugin['auth_cid'], - $plugin['auth_pw'] + $plugin['auth_pw'], + $plugin['socket_options'] ); if (!($error = $this->sieve->error())) { |