Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/default.php b/lib/default.php
index 5e711bb87c9fcb82277da9c2292ad5be859ef762..6420a05e5f387c6717b89bbbd41c1a4df64d079e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -36,6 +36,7 @@ $default =
               'theme' => 'neo-gnu',
               'path' => $_path,
               'logfile' => null,
+              'logdebug' => false,
               'logo' => null,
               'ssllogo' => null,
               'logperf' => false, // Enable to dump performance counters to syslog
@@ -97,6 +98,7 @@ $default =
         'queue' =>
         array('enabled' => true,
               'daemon' => false, # Use queuedaemon. Default to false
+              'threads' => null,    # an empty value here uses processor count to determine
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
               'queue_basename' => '/queue/statusnet/',
@@ -247,6 +249,7 @@ $default =
                                 'application/vnd.oasis.opendocument.text-web'               => 'oth',
                                 'application/pdf'   => 'pdf',
                                 'application/zip'   => 'zip',
+                                'application/x-bzip2' => 'bz2',
                                 'application/x-go-sgf' => 'sgf',
                                 'application/xml'   => 'xml',
                                 'application/gpx+xml' => 'gpx',
@@ -295,7 +298,7 @@ $default =
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null,
-              'addtag' => false),
+              'addtag' => true),
         '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
@@ -343,6 +346,7 @@ $default =
               'default' => array(
                             'Activity' => array(),
                             'AntiBrute' => array(),
+                            'Blacklist' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'DefaultLayout' => array(),
@@ -355,7 +359,6 @@ $default =
                             'OpportunisticQM' => array(),
                             'OStatus' => array(),
                             'Poll' => array(),
-                            'SearchSub' => array(),
                             'SimpleCaptcha' => array(),
                             'TagSub' => array(),
                             'WebFinger' => array(),
@@ -391,6 +394,7 @@ $default =
               'ssl_verify_host' => true,    // HTTPRequest2 makes sure this is set to CURLOPT_SSL_VERIFYHOST==2 if using curl
               'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
               'connect_timeout' => 5,
+              'timeout' => intval(ini_get('default_socket_timeout')),   // effectively should be this by default already, but this makes it more explicitly configurable for you users .)
               'proxy_host' => null,
               'proxy_port' => null,
               'proxy_user' => null,