Fix "PHP Fatal error: Cannot break/continue 1 level" when ldap_start_tls() ...

Aleksander Machniak

2014-06-10 0a5088758e4da6b80982f4fee16c48e7cc0e2fcc

Fix "PHP Fatal error: Cannot break/continue 1 level" when ldap_start_tls() fails

 program/lib/Roundcube/rcube_ldap_generic.php

@@ -175,9 +175,11 @@
        $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 @@
            $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']);