Merge commit '75245bbc807b67247234c9103b162008c5b5b326' into cweiske

[contagged] / inc / fields.php

diff --git a/inc/fields.php b/inc/fields.php
index 9229e7206462377b19f07ac677a9c8d9b4aed9af..25e05085be232fc0d4e70e03a7b528438ad54ab4 100644 (file)
--- a/inc/fields.php
+++ b/inc/fields.php
@@ -10,11 +10,12 @@
  * handled by the template as well)
  */
 
+global $conf;
 
 /**
  * The object classes to store with contacts
  */
-$OCLASSES[] = 'inetOrgPerson';
+$OCLASSES = $conf['oclasses'];
 
 /**
  * The standard fields suported by OpenLDAP's default schemas
@@ -47,46 +48,47 @@ $FIELDS = array(
  * If the provided "extended" schema is used the following fields
  * and object classes are added
  */
-$OCLASSES[] = 'contactPerson';
-$FIELDS['anniversary']  = 'anniversary';
-$FIELDS['_marker']      = 'marker';                  // aka. tags
-$FIELDS['country']      = 'c';
+if (array_search('contactPerson', $conf['oclasses']) !== false) {
+    $FIELDS['anniversary']  = 'anniversary';
+    $FIELDS['_marker']      = 'marker';                  // aka. tags
+    $FIELDS['country']      = 'c';
+}
 
 /**
  * If the open exchange schema is used the following fields
  * and object classes are added
  */
-/* comment in if you want to use it
-$OCLASSES[] = 'OXUserObject';
-$FIELDS['country']          = 'userCountry';
-$FIELDS['birthday']         = 'birthDay';
-$FIELDS['ipphone']          = 'IPPhone';
-$FIELDS['_marker']          = 'OXUserCategories';
-$FIELDS['instantmessenger'] = 'OXUserInstantMessenger';
-$FIELDS['timezone']         = 'OXTimeZone';
-$FIELDS['position']         = 'OXUserPosition';
-$FIELDS['certificate']      = 'relClientCert';
-$FIELDS['domain']           = 'domain';
-*/
+if (array_search('OXUserObject', $conf['oclasses']) !== false) {
+    $FIELDS['country']          = 'userCountry';
+    $FIELDS['birthday']         = 'birthDay';
+    $FIELDS['ipphone']          = 'IPPhone';
+    $FIELDS['_marker']          = 'OXUserCategories';
+    $FIELDS['instantmessenger'] = 'OXUserInstantMessenger';
+    $FIELDS['timezone']         = 'OXTimeZone';
+    $FIELDS['position']         = 'OXUserPosition';
+    $FIELDS['certificate']      = 'relClientCert';
+    $FIELDS['domain']           = 'domain';
+}
 
 /**
  * If the Evolution schema is used the following fields
  * and object classes are added
  */
-/* comment in if you want to use it
-$OCLASSES[] = 'evolutionPerson';
-$OCLASSES[] = 'officePerson';
-$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';
-*/
+if (array_search('evolutionPerson', $conf['oclasses']) !== false) {
+    $FIELDS['anniversary'] = 'anniversary';
+    $FIELDS['department']  = 'ou';
+    $FIELDS['state']       = 'st';
+    $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