Changeset 2894 in subversion

Timestamp:

Aug 29, 2009 4:56:00 PM (4 years ago)

Author:

alec

Message:

• Fix gn and givenName should be synonymous in LDAP addressbook (#1485892)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (5 diffs)
• program/steps/addressbook/func.inc (modified) (1 diff)
• program/steps/addressbook/search.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix gn and givenName should be synonymous in LDAP addressbook (#1485892)
 - Add mail_domain to LDAP email entries without @ sign (#1485201)
 - Fix saving empty values in LDAP contact data (#1485781)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -56 +56 @@
     foreach ($p as $prop => $value)
       if (preg_match('/^(.+)_field$/', $prop, $matches))
-        $this->fieldmap[$matches[1]] = strtolower($value);
+        $this->fieldmap[$matches[1]] = $this->_attr_name(strtolower($value));
+
+    foreach ($this->prop['required_fields'] as $key => $val)
+      $this->prop['required_fields'][$key] = $this->_attr_name(strtolower($val));
 
     $this->sort_col = $p['sort'];
@@ -553 +556 @@
    * @access private
    */
-  function _exec_search()
+  private function _exec_search()
   {
     if ($this->ready)
@@ -570 +573 @@
    * @access private
    */
-  function _ldap2result($rec)
+  private function _ldap2result($rec)
   {
     global $RCMAIL;
@@ -596 +599 @@
    * @access private
    */
-  function _map_field($field)
+  private function _map_field($field)
   {
     return $this->fieldmap[$field];
@@ -603 +606 @@
   
   /**
+   * @access private
+   */
+  private function _attr_name($name)
+  {
+    // list of known attribute aliases
+    $aliases = array(
+      'gn' => 'givenname',
+      'rfc822mailbox' => 'mail',
+      'userid' => 'uid',
+      'emailaddress' => 'email',
+      'pkcs9email' => 'email',
+    );
+    return isset($aliases[$name]) ? $aliases[$name] : $name;
+  }
+
+
+  /**
    * @static
    */

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -57 +57 @@
   $CONTACTS->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
 
-
 // set data source env
 $OUTPUT->set_env('source', $source ? $source : '0');

trunk/roundcubemail/program/steps/addressbook/search.inc

@@ -33 +33 @@
   // save search settings in session
   $_SESSION['search'][$search_request] = $CONTACTS->get_search_set();
-  
+
   // create javascript list
   rcmail_js_contacts_list($result);