Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/default.php b/lib/default.php
index 0fa8ce167850dc811ccbcd6e1d58b90a6ce1930d..6420a05e5f387c6717b89bbbd41c1a4df64d079e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -36,9 +36,9 @@ $default =
               'theme' => 'neo-gnu',
               'path' => $_path,
               'logfile' => null,
+              'logdebug' => false,
               '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,
@@ -65,6 +65,9 @@ $default =
               'notice' => null, // site wide notice text
               'build' => 1, // build number, for code-dependent cache
               ),
+        'security' =>
+        array('hash_algos' => ['sha1', 'sha256', 'sha512'],   // set to null for anything that hash_hmac() can handle (and is in hash_algos())
+        ),
         'db' =>
           array('database' => null, // must be set
               'schema_location' => INSTALLDIR . '/classes',
@@ -83,7 +86,11 @@ $default =
               'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
         'fix' =>
         array('fancyurls' => true,   // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
+              'legacy_http' => false,   // set this to true if you have upgraded your site from http=>https
               ),
+        'log' => [
+                'debugtrace' => false,  // index.php handleError function, whether to include exception backtrace in log
+            ],
         'syslog' =>
         array('appname' => 'statusnet', # for syslog
               'priority' => 'debug', # XXX: currently ignored
@@ -91,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/',
@@ -241,8 +249,10 @@ $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',
                                 'image/png'         => 'png',
                                 'image/jpeg'        => 'jpg',
                                 'image/gif'         => 'gif',
@@ -263,28 +273,32 @@ $default =
               'user_quota' => 50000000,
               'monthly_quota' => 15000000,
               'uploads' => true,
-              'filename_base' => 'hash',   // for new files, choose one: 'upload', 'hash'
               'show_html' => false,  // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls.
               'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
               'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages.
               'extblacklist' => [
-                    'php' => 'phps',
+                    'php' => 'phps',    // this turns .php into .phps
                     'exe' => false,  // this would deny any uploads to keep the "exe" file extension
                 ],
               ),
-        'thumbnail' =>
-        array('crop' => false,      // overridden to true if thumb height === null
+        'thumbnail' => [
+              'dir' => null,    // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] .  '/thumb/')
+              'path' => null,   // falls back to generating a URL with File::url('thumb/$filename') (equivalent to ['attachments']['path'] . '/thumb/')
+              'server' => null, // Only used if ['thumbnail']['path'] is NOT empty, and then it falls back to ['site']['server'], schema is decided from GNUsocial::useHTTPS()
+
+              'crop' => false,      // overridden to true if thumb height === null
               'maxsize' => 1000,     // thumbs with an edge larger than this will not be generated
               'width' => 450,
               'height' => 600,
               'upscale' => false,
-              'animated' => false), // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
+              'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
+            ],
         'application' =>
         array('desclimit' => null),
         '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
@@ -332,6 +346,7 @@ $default =
               'default' => array(
                             'Activity' => array(),
                             'AntiBrute' => array(),
+                            'Blacklist' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'DefaultLayout' => array(),
@@ -344,7 +359,6 @@ $default =
                             'OpportunisticQM' => array(),
                             'OStatus' => array(),
                             'Poll' => array(),
-                            'SearchSub' => array(),
                             'SimpleCaptcha' => array(),
                             'TagSub' => array(),
                             'WebFinger' => array(),
@@ -380,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,