Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

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

diff --git a/lib/default.php b/lib/default.php
index b0d530bd4d2ac919f8f41dcdb5c28a541f2e8212..5bec29cc5233880c169f0dcf3da8828748c23302 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -33,7 +33,7 @@ $default =
               'nickname' => 'gnusocial',
               'wildcard' => null,
               'server' => $_server,
-              'theme' => 'neo',
+              'theme' => 'neo-gnu',
               'path' => $_path,
               'logfile' => null,
               'logo' => null,
@@ -48,16 +48,17 @@ $default =
               'languages' => get_all_languages(),
               'email' =>
               array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
+              'fakeaddressrecovery' => true,
               'broughtby' => null,
               'timezone' => 'UTC',
               'broughtbyurl' => null,
               'closed' => false,
               'inviteonly' => true,
-              'private' => true,
+              'private' => false,
               'ssl' => 'never',
               'sslserver' => null,
               'dupelimit' => 60, // default for same person saying the same thing
-              'textlimit' => 0, // in chars; 0 == no limit
+              'textlimit' => 1000, // in chars; 0 == no limit
               'indent' => true,
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
@@ -126,8 +127,9 @@ $default =
         'profile' =>
         array('banned' => array(),
               'biolimit' => null,
+              'changenick' => false,
               'backup' => true,
-              'restore' => true,
+              'restore' => false,
               'delete' => false,
               'move' => true),
         'image' =>
@@ -180,7 +182,7 @@ $default =
         array('dropoff' => 864000.0,   # controls weighting based on age
               'cutoff' => 86400 * 90), # only look at notices favorited in last 90 days
         'daemon' =>
-        array('piddir' => '/var/run',
+        array('piddir' => sys_get_temp_dir(),
               'user' => false,
               'group' => false),
         'emailpost' =>
@@ -206,6 +208,9 @@ $default =
         'newuser' =>
         array('default' => null,
               'welcome' => null),
+        'linkify' => array(
+            'bare_domains' => false,  // convert domain.com to <a href="http://domain.com/" ...>domain.com</a> ?
+        ),
         'attachments' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
@@ -249,15 +254,17 @@ $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.
               ),
         'thumbnail' =>
         array('crop' => false,      // overridden to true if thumb height === null
-              'maxsize' => 600,     // thumbs with an edge larger than this will not be generated
+              'maxsize' => 1000,     // thumbs with an edge larger than this will not be generated
               'width' => 450,
-              'height' => 600),
+              'height' => 600,
+              'animated' => false), // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
         'application' =>
         array('desclimit' => null),
         'group' =>
@@ -279,6 +286,11 @@ $default =
         array('handle' => false,   // whether to handle sessions ourselves
               'debug' => false,    // debugging output for sessions
               'gc_limit' => 1000), // max sessions to expire at a time
+        'htmlfilter' => array(  // purify HTML through htmLawed
+            'img' => true,
+            'video' => true,
+            'audio' => true,
+        ),
         'notice' =>
         array('contentlimit' => null,
               'defaultscope' => null, // null means 1 if site/private, 0 otherwise
@@ -292,9 +304,11 @@ $default =
         array('disabled' => true),
         'plugins' =>
         array('core' => array(
+                            'ActivityVerb' => array(),
                             'AuthCrypt' => array(),
                             'Cronish' => array(),
                             'Favorite' => array(),
+                            'Share' => array(),
                             'LRDD' => array(),
                             'StrictTransportSecurity' => array(),
                         ),
@@ -303,6 +317,7 @@ $default =
                             'AntiBrute' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
+                            'DefaultLayout' => array(),
                             'Directory' => array(),
                             'DirectMessage' => array(),
                             'EmailAuthentication' => array(),
@@ -312,7 +327,6 @@ $default =
                             'OpportunisticQM' => array(),
                             'OStatus' => array(),
                             'Poll' => array(),
-                            'QnA' => array(),
                             'SearchSub' => array(),
                             'TagSub' => array(),
                             'WebFinger' => array(),
@@ -323,7 +337,6 @@ $default =
               'path' => null,
               'sslpath' => null,
               ),
-        'pluginlist' => array(),
         'admin' =>
         array('panels' => array('site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
         'singleuser' =>