[jan] Store full name in Kolab contacts.

horde · Dec 4, 2013 · 77fe459 · 77fe459
1 parent 22925af
commit 77fe459
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/turba/config/backends.php b/turba/config/backends.php
@@ -609,18 +609,28 @@
         '__type' => '__type',
         '__members' => '__members',
         /* Personal */
-        'name' => array('fields' => array('namePrefix', 'firstname',
-                                          'middlenames', 'lastname',
-                                          'nameSuffix'),
-                        'format' => '%s %s %s %s %s',
-                        'parse' => array(
-                            array('fields' => array('firstname', 'middlenames',
-                                                    'lastname'),
-                                  'format' => '%s %s %s'),
-                            array('fields' => array('lastname', 'firstname'),
-                                  'format' => '%s, %s'),
-                            array('fields' => array('firstname', 'lastname'),
-                                  'format' => '%s %s'))),
+        'name' => array(
+            'fields' => array(
+                'namePrefix', 'firstname', 'middlenames', 'lastname',
+                'nameSuffix'
+            ),
+            'format' => '%s %s %s %s %s',
+            'parse' => array(
+                array(
+                    'fields' => array('firstname', 'middlenames', 'lastname'),
+                    'format' => '%s %s %s'
+                ),
+                array(
+                    'fields' => array('lastname', 'firstname'),
+                    'format' => '%s, %s'
+                ),
+                array(
+                    'fields' => array('firstname', 'lastname'),
+                    'format' => '%s %s'
+                )
+            ),
+            'attribute' => 'full-name',
+        ),
         'firstname' => 'given-name',
         'lastname' => 'last-name',
         'middlenames' => 'middle-names',

diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.1.4-git
 ----------
 
+[jan] Store full name in Kolab contacts.
 [jan] Fix distribution list support in Kolab driver.
 
 

diff --git a/turba/lib/Driver/Kolab.php b/turba/lib/Driver/Kolab.php
@@ -125,7 +125,8 @@ public function toDriverKeys(array $hash)
         }
 
         /* TODO: use Horde_Kolab_Format_Xml_Type_Composite_* */
-        foreach (array('given-name',
+        foreach (array('full-name',
+                       'given-name',
                        'middle-names',
                        'last-name',
                        'initials',

diff --git a/turba/package.xml b/turba/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/asl">ASL</license>
  <notes>
+* [jan] Store full name in Kolab contacts.
 * [jan] Fix distribution list support in Kolab driver.
  </notes>
  <contents>
@@ -1734,6 +1735,7 @@
    <date>2013-10-29</date>
    <license uri="http://www.horde.org/licenses/asl">ASL</license>
    <notes>
+* [jan] Store full name in Kolab contacts.
 * [jan] Fix distribution list support in Kolab driver.
    </notes>
   </release>