From 9b9f27ef495394af95f9e6447e5b41fc40affd39 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 31 May 2011 17:24:24 +0000 Subject: - Fixed handling of REFERRAL responses (http://pear.php.net/bugs/bug.php?id=17107) git-svn-id: https://svn.roundcube.net/trunk@4821 208e9e7b-5314-0410-a742-e7e81cd9613c --- plugins/managesieve/Changelog | 1 + plugins/managesieve/lib/Net/Sieve.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) (limited to 'plugins') diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index d78d5b264..6cc5159be 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,4 +1,5 @@ - Fixed handling of error in Net_Sieve::listScripts() +- Fixed handling of REFERRAL responses (http://pear.php.net/bugs/bug.php?id=17107) * version 4.2 [2011-05-24] ----------------------------------------------------------- diff --git a/plugins/managesieve/lib/Net/Sieve.php b/plugins/managesieve/lib/Net/Sieve.php index 0f6a5f67a..a8e36d8d7 100644 --- a/plugins/managesieve/lib/Net/Sieve.php +++ b/plugins/managesieve/lib/Net/Sieve.php @@ -296,6 +296,13 @@ class Net_Sieve */ function connect($host, $port, $options = null, $useTLS = true) { + $this->_data['host'] = $host; + $this->_data['port'] = $port; + $this->_useTLS = $useTLS; + if (!empty($options) && is_array($options)) { + $this->_options = array_merge($this->_options, $options); + } + if (NET_SIEVE_STATE_DISCONNECTED != $this->_state) { return PEAR::raiseError('Not currently in DISCONNECTED state', 1); } @@ -359,6 +366,12 @@ class Net_Sieve */ function login($user, $pass, $logintype = null, $euser = '', $bypassAuth = false) { + $this->_data['user'] = $user; + $this->_data['pass'] = $pass; + $this->_data['logintype'] = $logintype; + $this->_data['euser'] = $euser; + $this->_bypassAuth = $bypassAuth; + if (NET_SIEVE_STATE_AUTHORISATION != $this->_state) { return PEAR::raiseError('Not currently in AUTHORISATION state', 1); } -- cgit v1.2.3