diff options
| author | alecpl <alec@alec.pl> | 2011-05-04 19:31:42 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-05-04 19:31:42 +0000 |
| commit | 56651c15c8fb076b61c41c8e649dda6b9bf4f56f (patch) | |
| tree | c01524186c14833e659c6e8f14558f151c3db635 | |
| parent | 630f0e41acfd254554262fad06ea7461c9578f7b (diff) | |
- Stop execution when LDAP addressbook is configured but PHP's ldap functions doesn't exists
| -rw-r--r-- | program/include/rcube_ldap.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 742cb6412..d9f5a104f 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -127,8 +127,9 @@ class rcube_ldap extends rcube_addressbook if (!function_exists('ldap_connect')) raise_error(array('code' => 100, 'type' => 'ldap', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "No ldap support in this installation of PHP"), true); + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "No ldap support in this installation of PHP"), + true, true); if (is_resource($this->conn)) return true; @@ -251,11 +252,10 @@ class rcube_ldap extends rcube_addressbook } if (!function_exists('ldap_sasl_bind')) { - raise_error(array( - 'code' => 100, 'type' => 'ldap', + raise_error(array('code' => 100, 'type' => 'ldap', 'file' => __FILE__, 'line' => __LINE__, 'message' => "Unable to bind: ldap_sasl_bind() not exists"), - true, true); + true, true); } if (!empty($authz)) { @@ -310,11 +310,11 @@ class rcube_ldap extends rcube_addressbook $this->_debug("S: ".ldap_error($this->conn)); - $error = array( - 'code' => ldap_errno($this->conn), 'type' => 'ldap', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)); - raise_error($error,true); + raise_error(array( + 'code' => ldap_errno($this->conn), 'type' => 'ldap', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)), + true); return false; } |