Changeset 523 in subversion

Timestamp:

Mar 27, 2007 10:27:20 AM (6 years ago)

Author:

thomasb

Message:

devel-addressbook: refinements in LDAP config and search

Location:

branches/devel-addressbook

Files:

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

branches/devel-addressbook/config/main.inc.php.dist

@@ -187 +187 @@
 // simply uncomment the Verisign example.
 /** 
- *  example config for Verisign directory
+ * example config for Verisign directory
  *
- *  $rcmail_config['ldap_public']['Verisign'] = array('hosts'         => array('directory.verisign.com'),
- *                                                    'port'          => 389,
- *                                                    'base_dn'       => '',
- *                                                    'search_fields' => array('Email' => 'mail', 'Name' => 'cn'),
- *                                                    'name_field'    => 'cn',
- *                                                    'mail_field'    => 'mail',
- *                                                    'scope'         => 'sub',
- *                                                    'fuzzy_search'  => 0);
+ * $rcmail_config['ldap_public']['Verisign'] = array(
+ *  'name'          => 'Verisign.com',
+ *  'hosts'         => array('directory.verisign.com'),
+ *  'port'          => 389,
+ *  'base_dn'       => '',
+ *  'search_fields' => array('mail', 'cn'),
+ *  'name_field'    => 'cn',
+ *  'email_field'   => 'mail',
+ *  'scope'         => 'sub',
+ *  'fuzzy_search'  => 0);
  */
 

branches/devel-addressbook/program/include/rcube_ldap.inc

@@ -261 +261 @@
     
     $filter = '(|';
-    foreach ((array)$fields as $field)
-      if ($f = $this->_map_field($field))
-        $filter .= "($f=*" . rcube_ldap::quote_string($value) . "*)";
+    if (is_array($this->prop['search_fields']))
+    {
+      foreach ($this->prop['search_fields'] as $k => $field)
+        $filter .= "($field=*" . rcube_ldap::quote_string($value) . "*)";
+    }
+    else
+    {
+      foreach ((array)$fields as $field)
+        if ($f = $this->_map_field($field))
+          $filter .= "($f=*" . rcube_ldap::quote_string($value) . "*)";
+    }
     $filter .= ')';