Merge branch '2015.11-develop' into 2016.11
[tine20] / tine20 / Tinebase / Config.php
index 96d4ad0..4aae225 100644 (file)
@@ -373,12 +373,12 @@ class Tinebase_Config extends Tinebase_Config_Abstract
     /**
      * maintenance mode
      *
-     * @var bool
+     * @var string
      */
     const MAINTENANCE_MODE = 'maintenanceMode';
 
     /**
-     * @var array of strings
+     * @var string
      */
     const FAT_CLIENT_CUSTOM_JS = 'fatClientCustomJS';
     
@@ -389,6 +389,16 @@ class Tinebase_Config extends Tinebase_Config_Abstract
     const BRANDING_DESCRIPTION = 'branding_description';
 
     /**
+     * @var string
+     */
+    const USE_LOGINNAME_AS_FOLDERNAME = 'useLoginnameAsFoldername';
+
+    /**
+     * @var string
+     */
+    const VERSION_CHECK = 'versionCheck';
+
+    /**
      * (non-PHPdoc)
      * @see tine20/Tinebase/Config/Definition::$_properties
      */
@@ -883,6 +893,16 @@ class Tinebase_Config extends Tinebase_Config_Abstract
             'setByAdminModule'      => TRUE,
             'setBySetupModule'      => TRUE,
         ),
+        self::VERSION_CHECK => array(
+            //_('Version check enabled')
+            'label'                 => 'Version check enabled',
+            'description'           => 'Version check enabled',
+            'type'                  => 'bool',
+            'default'               => true,
+            'clientRegistryInclude' => true,
+            'setByAdminModule'      => false,
+            'setBySetupModule'      => false,
+        ),
         self::FAT_CLIENT_CUSTOM_JS => array(
             // NOTE: it's possible to deliver customjs vom vfs by using the tine20:// streamwrapper
             //       tine20://<applicationid>/folders/shared/<containerid>/custom.js
@@ -951,6 +971,17 @@ class Tinebase_Config extends Tinebase_Config_Abstract
                 'setByAdminModule'      => FALSE,
                 'setBySetupModule'      => FALSE,
         ),
+        self::USE_LOGINNAME_AS_FOLDERNAME => array(
+        //_('Use login name instead of full name')
+            'label'                 => 'Use login name instead of full name',
+        //_('Use login name instead of full name for webdav.')
+            'description'           => 'Use login name instead of full name for webdav.',
+            'type'                  => 'bool',
+            'clientRegistryInclude' => FALSE,
+            'setByAdminModule'      => FALSE,
+            'setBySetupModule'      => FALSE,
+            'default'               => FALSE,
+        ),
     );
     
     /**