diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/js/common.js | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_ldap_generic.php | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/program/js/common.js b/program/js/common.js index f4446c21c..76643068d 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -288,6 +288,7 @@ is_keyboard: function(e) return e && ( (e.pointerType !== undefined && e.pointerType !== 'mouse') || // IE 11+ (e.mozInputSource && e.mozInputSource == e.MOZ_SOURCE_KEYBOARD) || // Firefox + (e.offsetX === 0 && e.offsetY === 0) || // Opera (!e.pageX && (e.pageY || 0) <= 0 && !e.clientX && (e.clientY || 0) <= 0) || // others (bw.ie && rcube_event._last_keyboard_event && rcube_event._last_keyboard_event.target == e.target) // hack for IE <= 10 ); diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php index 252eafabe..25fe2e5d2 100644 --- a/program/lib/Roundcube/rcube_ldap_generic.php +++ b/program/lib/Roundcube/rcube_ldap_generic.php @@ -175,9 +175,11 @@ class rcube_ldap_generic $this->_debug("C: Connect to $hostname [{$this->config['name']}]"); if ($lc = @ldap_connect($host, $this->config['port'])) { - if ($this->config['use_tls'] === true) - if (!ldap_start_tls($lc)) - continue; + if ($this->config['use_tls'] === true) { + if (!ldap_start_tls($lc)) { + return false; + } + } $this->_debug("S: OK"); @@ -186,7 +188,7 @@ class rcube_ldap_generic $this->conn = $lc; if (!empty($this->config['network_timeout'])) - ldap_set_option($lc, LDAP_OPT_NETWORK_TIMEOUT, $this->config['network_timeout']); + ldap_set_option($lc, LDAP_OPT_NETWORK_TIMEOUT, $this->config['network_timeout']); if (isset($this->config['referrals'])) ldap_set_option($lc, LDAP_OPT_REFERRALS, $this->config['referrals']); |