Merge branch '2015.11' into 2015.11-develop
[tine20] / tine20 / Tinebase / Config.php
index 4bfb060..437eec5 100644 (file)
@@ -84,6 +84,13 @@ class Tinebase_Config extends Tinebase_Config_Abstract
     const CRONUSERID = 'cronuserid';
 
     /**
+     * setup user id
+     *
+     * @var string
+     */
+    const SETUPUSERID = 'setupuserid';
+
+    /**
      * FEATURE_SHOW_ADVANCED_SEARCH
      *
      * @var string
@@ -91,6 +98,13 @@ class Tinebase_Config extends Tinebase_Config_Abstract
     const FEATURE_SHOW_ADVANCED_SEARCH = 'featureShowAdvancedSearch';
 
     /**
+     * FEATURE_CONTAINER_CUSTOM_SORT
+     *
+     * @var string
+     */
+    const FEATURE_CONTAINER_CUSTOM_SORT = 'featureContainerCustomSort';
+
+    /**
      * FEATURE_SHOW_ACCOUNT_EMAIL
      *
      * @var string
@@ -98,6 +112,13 @@ class Tinebase_Config extends Tinebase_Config_Abstract
     const FEATURE_SHOW_ACCOUNT_EMAIL = 'featureShowAccountEmail';
 
     /**
+     * FEATURE_REMEMBER_POPUP_SIZE
+     *
+     * @var string
+     */
+    const FEATURE_REMEMBER_POPUP_SIZE = 'featureRememberPopupSize';
+
+    /**
      * user defined page title postfix for browser page title
      * 
      * @var string
@@ -352,22 +373,28 @@ 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';
     
+    const BRANDING_LOGO = 'branding_logo';
+    const BRANDING_FAVICON = 'branding_favicon';
+    const BRANDING_TITLE = 'branding_title';
+    const BRANDING_WEBURL = 'branding_weburl';
+    const BRANDING_DESCRIPTION = 'branding_description';
+
     /**
-     * @var boolean
+     * @var string
      */
     const USE_LOGINNAME_AS_FOLDERNAME = 'useLoginnameAsFoldername';
 
     /**
-     * @var array of strings
+     * @var string
      */
     const VERSION_CHECK = 'versionCheck';
 
@@ -485,15 +512,27 @@ class Tinebase_Config extends Tinebase_Config_Abstract
                     'description'   => 'Show toggle button to switch on or off the advanced search for the quickfilter',
                     //_('Show toggle button to switch on or off the advanced search for the quickfilter')
                 ),
+                self::FEATURE_CONTAINER_CUSTOM_SORT => array(
+                    'label'         => 'Container Custom Sort', //_('Container Custom Sort')
+                    'description'   => 'Allows to sort containers by setting the sort order in Admin/Container',
+                    //_('Allows to sort containers by setting the sort order in Admin/Container')
+                ),
                 self::FEATURE_SHOW_ACCOUNT_EMAIL => array(
                     'label'         => 'Show Account Email Address', //_('Show Account Email Address')
                     'description'   => 'Show email address in account picker and attendee grids',
                     //_('Show email address in account picker and attendee grids')
                 ),
+                self::FEATURE_REMEMBER_POPUP_SIZE => array(
+                    'label'         => 'Remeber Popup Size', //_('Remeber Popup Size')
+                    'description'   => 'Save edit dialog size in state',
+                    //_('Save edit dialog size in state')
+                ),
             ),
             'default'               => array(
-                self::FEATURE_SHOW_ADVANCED_SEARCH => false,
-                self::FEATURE_SHOW_ACCOUNT_EMAIL => false,
+                self::FEATURE_SHOW_ADVANCED_SEARCH  => false,
+                self::FEATURE_CONTAINER_CUSTOM_SORT => false,
+                self::FEATURE_SHOW_ACCOUNT_EMAIL    => false,
+                self::FEATURE_REMEMBER_POPUP_SIZE   => false,
             ),
         ),
         self::CRONUSERID => array(
@@ -878,6 +917,61 @@ class Tinebase_Config extends Tinebase_Config_Abstract
             'setByAdminModule'      => FALSE,
             'setBySetupModule'      => FALSE,
         ),
+        self::BRANDING_DESCRIPTION => array(
+                //_('custom description')
+                'label'                 => 'custom description',
+                //_('Custom description for branding.')
+                'description'           => 'Custom description for branding.',
+                'type'                  => 'string',
+                'default'               => '',
+                'clientRegistryInclude' => FALSE,
+                'setByAdminModule'      => FALSE,
+                'setBySetupModule'      => FALSE,
+        ),
+        self::BRANDING_WEBURL => array(
+                //_('custom weburl')
+                'label'                 => 'custom weburl',
+                //_('Custom weburl for branding.')
+                'description'           => 'Custom weburl for branding.',
+                'type'                  => 'string',
+                'default'               => '',
+                'clientRegistryInclude' => FALSE,
+                'setByAdminModule'      => FALSE,
+                'setBySetupModule'      => FALSE,
+        ),
+        self::BRANDING_TITLE => array(
+                //_('custom title')
+                'label'                 => 'custom title',
+                //_('Custom title for branding.')
+                'description'           => 'Custom ltitle for branding.',
+                'type'                  => 'string',
+                'default'               => '',
+                'clientRegistryInclude' => FALSE,
+                'setByAdminModule'      => FALSE,
+                'setBySetupModule'      => FALSE,
+        ),
+        self::BRANDING_LOGO => array(
+                //_('custom logo path')
+                'label'                 => 'custom logo path',
+                //_('Path to custom logo.')
+                'description'           => 'Path to custom logo.',
+                'type'                  => 'string',
+                'default'               => '',
+                'clientRegistryInclude' => FALSE,
+                'setByAdminModule'      => FALSE,
+                'setBySetupModule'      => FALSE,
+        ),
+        self::BRANDING_FAVICON => array(
+                //_('custom favicon path')
+                'label'                 => 'custom favicon path',
+                //_('Path to custom favicon.')
+                'description'           => 'Path to custom favicon.',
+                'type'                  => 'string',
+                'default'               => '',
+                'clientRegistryInclude' => FALSE,
+                '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',
@@ -888,7 +982,7 @@ class Tinebase_Config extends Tinebase_Config_Abstract
             'setByAdminModule'      => FALSE,
             'setBySetupModule'      => FALSE,
             'default'               => FALSE,
-        )
+        ),
     );
     
     /**