From e4338fdf384f040101be3fad507c16ecb229580a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 13 Mar 2015 03:46:25 -0400
Subject: [PATCH] Fix missing host:port in connection error message
---
plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 2f2791d..282ffa9 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -122,9 +122,6 @@
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 @@
$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;
}
/**
--
Gitblit v1.9.1