Changeset e3caaf5 in github

Timestamp:

May 17, 2007 11:58:51 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

7198044

Parents:

02342ff

Message:

Use global filters and bind username/ for Ldap searches (#1484159)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_ldap.inc (modified) (4 diffs)

CHANGELOG

@@ -4 +4 @@
 2007/05/17 (thomasb)
 ----------
-- Updated Catalan, Russian, and Chinese translations
+- Updated Catalan, Russian, Portuguese and Chinese translations
 - Renamed localization folder for Chinese (Big5)
 - Chanegd Slovenian language code from 'si' to 'sl'
+- Added Sinhala (Sri-Lanka) localization
+- Use global filters and bind username/ for Ldap searches (#1484159)
 
 

config/main.inc.php.dist

@@ -198 +198 @@
  *  'port'          => 389,
  *  'base_dn'       => '',
+ *  'bind_dn'       => '',
+ *  'bind_pass'     => '',
  *  'search_fields' => array('mail', 'cn'),  // fields to search in
  *  'name_field'    => 'cn',    // this field represents the contact's name
  *  'email_field'   => 'mail',  // this field represents the contact's e-mail
  *  'scope'         => 'sub',   // search mode: sub|base|list
+ *  'filter'        => '',      // will be &'d with search field ex: (status=act)
  *  'fuzzy_search'  => true);   // server allows wildcard search
  */

program/include/rcube_ldap.inc

@@ -94 +94 @@
     
     if (is_resource($this->conn))
+    {
       $this->ready = true;
+      if (!empty($this->prop['bind_dn']) && !empty($this->prop['bind_pass']))
+        $this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']);
+    }
     else
       raise_error(array('type' => 'ldap', 'message' => "Could not connect to any LDAP server, tried $host:{$this->prop[port]} last"), true);
@@ -101 +105 @@
 
   /**
-   * Merge with connect()?
-   */
-  function bind($dn=null, $pass=null)
-  {
-    if ($this->conn)
-    {
-      if ($dn)
-      {
-        if (@ldap_bind($this->conn, $dn, $pass))
-          return true;
-        else
-          raise_error(array('code' => ldap_errno($this->conn),
-                            'type' => 'ldap',
-                            'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
-                      true);
-      }
-      else
-      {
-        if (@ldap_bind($this->conn))
-          return true;
-        else
-          raise_error(array('code' => ldap_errno($this->conn),
-                            'type' => 'ldap',
-                            'message' => "Anonymous bind failed: ".ldap_error($this->conn)),
-                      true);
-        }
-    }
+   * Bind connection with DN and password
+   */
+  function bind($dn, $pass)
+  {
+    if (!$this->conn)
+      return false;
+    
+    if (@ldap_bind($this->conn, $dn, $pass))
+      return true;
     else
-      raise_error(array('type' => 'ldap', 'message' => "Attempted bind on nonexistent connection"), true);
-      
+    {
+      raise_error(array(
+        'code' => ldap_errno($this->conn),
+        'type' => 'ldap',
+        'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
+      true);
+    }
+    
     return false;
-    }
+  }
 
 
@@ -271 +263 @@
     }
     $filter .= ')';
+    
+    // add general filter to query
+    if (!empty($this->prop['filter']))
+      $filter = '(&'.$this->prop['filter'] . $filter . ')';
 
     // set filter string and execute search
@@ -386 +382 @@
     {
       $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
-      $this->ldap_result = @$function($this->conn, $this->prop['base_dn'], $this->filter, array_values($this->fieldmap), 0, 0);
+      $this->ldap_result = $function($this->conn, $this->prop['base_dn'], $this->filter, array_values($this->fieldmap), 0, 0);
       return true;
     }