Changeset 56651c1 in github

Timestamp:

May 4, 2011 3:31:42 PM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

7c141cc

Parents:

630f0e4

Message:

• Stop execution when LDAP addressbook is configured but PHP's ldap functions doesn't exists

File:

• program/include/rcube_ldap.php (modified) (3 diffs)

program/include/rcube_ldap.php

@@ -128 +128 @@
         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))
@@ -252 +253 @@
 
         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);
         }
 
@@ -311 +311 @@
         $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;