Fix missing host:port in connection error message

pull/280/head
Aleksander Machniak 10 years ago
parent 979f08e4df
commit f62fe135bf

@ -2,6 +2,7 @@
-----------------------------------------------------------
- Fix PHP fatal error when visiting Vacation interface and there's no sieve script yet
- Fix handling of header test with one-element array as header name
- Fix missing host:port in connection error message
* version 8.2 [2015-01-14]
-----------------------------------------------------------

@ -122,9 +122,6 @@ class rcube_sieve_engine
case rcube_sieve::ERROR_CONNECTION:
case rcube_sieve::ERROR_LOGIN:
$this->rc->output->show_message('managesieve.filterconnerror', 'error');
rcube::raise_error(array('code' => 403, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Unable to connect to managesieve on $host:$port"), true, false);
break;
default:
@ -210,7 +207,18 @@ class rcube_sieve_engine
$plugin['socket_options']
);
return $this->sieve->error();
$error = $this->sieve->error();
if ($error) {
rcube::raise_error(array(
'code' => 403,
'file' => __FILE__,
'line' => __LINE__,
'message' => "Unable to connect to managesieve on $host:$port"
), true, false);
}
return $error;
}
/**

Loading…
Cancel
Save