Merge branch '2014.11-develop' into 2015.11
[tine20] / tine20 / Tinebase / Config.php
index c425950..6a4a6f8 100644 (file)
@@ -82,7 +82,14 @@ class Tinebase_Config extends Tinebase_Config_Abstract
      * @var string
      */
     const CRONUSERID = 'cronuserid';
-    
+
+    /**
+     * FEATURE_SHOW_ADVANCED_SEARCH
+     *
+     * @var string
+     */
+    const FEATURE_SHOW_ADVANCED_SEARCH = 'featureShowAdvancedSearch';
+
     /**
      * user defined page title postfix for browser page title
      * 
@@ -436,6 +443,24 @@ class Tinebase_Config extends Tinebase_Config_Abstract
             'setByAdminModule'      => FALSE,
             'setBySetupModule'      => TRUE,
         ),
+        self::ENABLED_FEATURES => array(
+            //_('Enabled Features')
+            'label'                 => 'Enabled Features',
+            'description'           => 'Enabled Features',
+            'type'                  => 'object',
+            'class'                 => 'Tinebase_Config_Struct',
+            'clientRegistryInclude' => TRUE,
+            'content'               => array(
+                self::FEATURE_SHOW_ADVANCED_SEARCH => array(
+                    'label'         => 'Show Advanced Search', //_('Show Advanced Search')
+                    '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')
+                ),
+            ),
+            'default'               => array(
+                self::FEATURE_SHOW_ADVANCED_SEARCH => false,
+            ),
+        ),
         self::CRONUSERID => array(
                                    //_('Cronuser ID')
             'label'                 => 'Cronuser ID',
@@ -795,19 +820,31 @@ class Tinebase_Config extends Tinebase_Config_Abstract
      * @var Tinebase_Config
      */
     private static $_instance = NULL;
-    
+
+    /**
+     * server classes
+     *
+     * @var array
+     */
+    protected static $_serverPlugins = array(
+        'Tinebase_Server_Plugin_Json'   => 80,
+        'Tinebase_Server_Plugin_WebDAV' => 80,
+        'Tinebase_Server_Plugin_Cli'    => 90,
+        'Tinebase_Server_Plugin_Http'   => 100
+    );
+
     /**
      * the constructor
      *
      * don't use the constructor. use the singleton 
-     */    
+     */
     private function __construct() {}
     
     /**
      * the constructor
      *
      * don't use the constructor. use the singleton 
-     */    
+     */
     private function __clone() {}
     
     /**