Merge branch '1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index 186ac263c94fc511d9115f0f56c8d1e2043d428a..8489caab504c90369ce1a6556d20289cd156e33e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -33,12 +33,14 @@ $default =
               'nickname' => 'statusnet',
               'wildcard' => null,
               'server' => $_server,
-              'theme' => 'default',
+              'theme' => 'neo',
               'path' => $_path,
               'logfile' => null,
               'logo' => null,
               'ssllogo' => null,
               'logdebug' => false,
+              'logperf' => false, // Enable to dump performance counters to syslog
+              'logperf_detail' => false, // Enable to dump every counter hit
               'fancy' => false,
               'locale_path' => INSTALLDIR.'/locale',
               'language' => 'en',
@@ -61,6 +63,7 @@ $default =
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
               'build' => 1, // build number, for code-dependent cache
+              'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
               ),
         'db' =>
         array('database' => 'YOU HAVE TO SET THIS IN config.php',
@@ -266,12 +269,18 @@ $default =
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null),
+        'peopletag' =>
+        array('maxtags' => 100, // maximum number of tags a user can create.
+              'maxpeople' => 500, // maximum no. of people with the same tag by the same user
+              'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
+              'desclimit' => null),
         'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
         'search' =>
         array('type' => 'fulltext'),
         'sessions' =>
-        array('handle' => false, // whether to handle sessions ourselves
-              'debug' => false), // debugging output for sessions
+        array('handle' => false,   // whether to handle sessions ourselves
+              'debug' => false,    // debugging output for sessions
+              'gc_limit' => 1000), // max sessions to expire at a time
         'design' =>
         array('backgroundcolor' => null, // null -> 'use theme default'
               'contentcolor' => null,
@@ -304,6 +313,10 @@ $default =
                                  'StrictTransportSecurity' => null,
                                  'OpenID' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
+              'server' => null,
+              'sslserver' => null,
+              'path' => null,
+              'sslpath' => null,
               ),
         'pluginlist' => array(),
         'admin' =>