summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/managesieve/Changelog1
-rw-r--r--plugins/managesieve/lib/Net/Sieve.php13
2 files changed, 14 insertions, 0 deletions
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);
}