support multiple URLs

[contagged] / inc / fields.php

diff --git a/inc/fields.php b/inc/fields.php
index 23e933b4305beab44a45dfe56d791671e9b9332c..0c236be696a51d1d33b7c4cf5938f15719736cc2 100644 (file)
--- a/inc/fields.php
+++ b/inc/fields.php
@@ -38,7 +38,7 @@ $FIELDS = array(
     'homephone'    => 'homePhone',
     'homestreet'   => 'homePostalAddress',
     'photo'        => 'jpegPhoto',
-    'url'          => 'labeledURI',
+    '_url'         => 'labeledURI',
     'note'         => 'description',
     'manager'      => 'manager',                     // aka. key account
     '_mail'        => 'mail',
@@ -75,17 +75,21 @@ if (array_search('OXUserObject', $conf['oclasses']) !== false) {
  * and object classes are added
  */
 if (array_search('evolutionPerson', $conf['oclasses']) !== false) {
+    $FIELDS['anniversary'] = 'anniversary';
     $FIELDS['department']  = 'ou';
     $FIELDS['state']       = 'st';
-    $FIELDS['country']     = 'c';
     $FIELDS['phone']       = 'primaryPhone';
     $FIELDS['switchboard'] = 'companyPhone';
     $FIELDS['note']        = 'note';
     $FIELDS['manager']     = 'seeAlso';
     $FIELDS['birthday']    = 'birthDate';
     $FIELDS['spouse']      = 'spouseName';
+    $FIELDS['_marker']     = 'categories'; // aka. tags
 }
 
+// add custom fields from config
+$FIELDS = array_merge($FIELDS, $conf['customFields']);
+
 /**
  * Flip the array
  */