Merge branch '2013.10' into 2014.11
[tine20] / tine20 / Tinebase / Config.php
index e5628e4..20ac750 100644 (file)
@@ -136,7 +136,14 @@ class Tinebase_Config extends Tinebase_Config_Abstract
      * @var string
      */
     const LDAP_DISABLE_TLSREQCERT = 'ldapDisableTlsReqCert';
-    
+
+    /**
+     * overwritten ldap fields
+     *
+     * @var string
+     */
+    const LDAP_OVERWRITE_CONTACT_FIELDS = 'ldapOverwriteContactFields';
+
     /**
      * configure hook class for user sync
      *
@@ -499,6 +506,19 @@ class Tinebase_Config extends Tinebase_Config_Abstract
             'setBySetupModule'      => true,
             'default'               => false
         ),
+        // TODO should this be added to LDAP config array/struct?
+        // TODO does this depend on LDAP readonly option?
+        self::LDAP_OVERWRITE_CONTACT_FIELDS => array(
+            //_('Contact fields overwritten by LDAP')
+            'label'                 => 'Contact fields overwritten by LDAP',
+            //_('These fields are overwritten during LDAP sync if empty')
+            'description'           => 'These fields are overwritten during LDAP sync if empty',
+            'type'                  => 'array',
+            'clientRegistryInclude' => false,
+            'setByAdminModule'      => false,
+            'setBySetupModule'      => true,
+            'default'               => array()
+        ),
         self::SYNC_USER_HOOK_CLASS => array(
                                    //_('Configure hook class for user sync')
             'label'                 => 'Configure hook class for user sync',