Changeset 4357 in subversion

Timestamp:

Dec 22, 2010 8:29:42 AM (2 years ago)

Author:

thomasb

Message:

Extend field mapping of LDAP address books; samml bugfixes

Location:

branches/devel-addressbook

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (5 diffs)
• program/js/app.js (modified) (1 diff)
• program/steps/addressbook/func.inc (modified) (2 diffs)

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

@@ -458 +458 @@
   'search_fields' => array('mail', 'cn'),  // fields to search in
   'fieldmap' => array(      // mapping of contact fields to directory attributes
-    // roundcube  => ldap
+    // Roundcube  => LDAP
     'name'        => 'cn',
     'surname'     => 'sn',
     'firstname'   => 'givenName',
-    'phone'       => 'telephoneNumber',
     'email'       => 'mail',
+    'phone:home'  => 'homePhone',
+    'phone:work'  => 'telephoneNumber',
+    'phone:mobile' => 'mobile',
     'street'      => 'street',
     'zipcode'     => 'postalCode',

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

@@ -61 +61 @@
     if (is_array($p['fieldmap'])) {
       foreach ($p['fieldmap'] as $rf => $lf)
-          $this->fieldmap[$rf] = $this->_attr_name(strtolower($lf));
+        $this->fieldmap[$rf] = $this->_attr_name(strtolower($lf));
     }
     else {
@@ -71 +71 @@
     
     // use fieldmap to advertise supported coltypes to the application
-    $this->coltypes = array_keys($this->fieldmap);
+    foreach ($this->fieldmap as $col => $lf) {
+      list($col, $type) = explode(':', $col);
+      if (!is_array($this->coltypes[$col]))
+        $this->coltypes[$col] = array('limit' => 1, 'subtypes' => array($type));
+      else if ($type) {
+        $this->coltypes[$col]['subtypes'][] = $type;
+        $this->coltypes[$col]['limit']++;
+      }
+      if ($type && !$this->fieldmap[$col])
+        $this->fieldmap[$col] = $lf;
+    }
+    
     if ($this->fieldmap['street'] && $this->fieldmap['locality'])
-      $this->coltypes[] = 'address';
+      $this->coltypes['address'] = array('limit' => 1);
+    else if ($this->coltypes['address'])
+      $this->coltypes['address'] = array('type' => 'textarea', 'childs' => null, 'limit' => 1);
 
     // make sure 'required_fields' is an array
@@ -547 +560 @@
     $replacedata = array();
     $deletedata = array();
-    foreach ($save_cols as $col => $val) {
-      $fld = $this->_map_field($col);
+    foreach ($this->fieldmap as $col => $fld) {
+      $val = $save_cols[$col];
       if ($fld) {
         // The field does exist compare it to the ldap record.
@@ -589 +602 @@
       if ($replacedata[$this->prop['LDAP_rdn']]) {
         $newdn = $this->prop['LDAP_rdn'].'='
-          .rcube_ldap::quote_string($replacedata[$this->prop['LDAP_rdn']], true)
-          .','.$this->prop['base_dn']; 
+          .rcube_ldap::quote_string($replacedata[$this->prop['LDAP_rdn']], true)
+          .','.$this->prop['base_dn'];
         if ($dn != $newdn) {
           $newrdn = $this->prop['LDAP_rdn'].'='
-            .rcube_ldap::quote_string($replacedata[$this->prop['LDAP_rdn']], true);
+            .rcube_ldap::quote_string($replacedata[$this->prop['LDAP_rdn']], true);
           unset($replacedata[$this->prop['LDAP_rdn']]);
         }
@@ -603 +616 @@
           $this->_debug("S: ".ldap_error($this->conn));
           return false;
-        }
+        }
         $this->_debug("S: OK");
       } // end if

branches/devel-addressbook/program/js/app.js

@@ -4083 +4083 @@
       else
         option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
-    }
-    else
-      alert('addmennu not found')
+      addmenu.show();
+    }
   };
 

branches/devel-addressbook/program/steps/addressbook/func.inc

@@ -126 +126 @@
         $id = strval($source['id'] ? $source['id'] : $j);
         $js_id = JQ($id);
-        $dom_id = preg_replace('/[^a-z0-9\-_]/i', '', $id);
+        $dom_id = preg_replace('/[^a-z0-9\-_]/i', '_', $id);
         $out .= sprintf($line_templ, $dom_id, ($current === $id ? 'selected' : ''),
             Q(rcmail_url(null, array('_source' => $id))),
@@ -500 +500 @@
 
             // also render add-field selector
-            if ($edit_mode && $select_add->_count)
-                $content .= html::p('addfield', $select_add->show(null));
+            if ($edit_mode)
+                $content .= html::p('addfield', $select_add->show(null, array('style' => $select_add->_count ? null : 'display:none')));
 
             $content = html::div(array('id' => 'contactsection' . $section), $content);