Merge branch 'master' of git.gnu.io:Quix0r/gnu-social

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

diff --git a/lib/default.php b/lib/default.php
index b1c6d5ea3375284a1b32d18a15a04d2308e02b81..bb68e1e5a499721be930fb2d971bfb416d61ae03 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -53,7 +53,7 @@ $default =
               'broughtbyurl' => null,
               'closed' => false,
               'inviteonly' => true,
-              'private' => true,
+              'private' => false,
               'ssl' => 'never',
               'sslserver' => null,
               'dupelimit' => 60, // default for same person saying the same thing
@@ -132,7 +132,7 @@ $default =
               'delete' => false,
               'move' => true),
         'image' =>
-        array('jpegquality' => 85),
+        array('jpegquality' => 95),
         'avatar' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/avatar/',
@@ -181,7 +181,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' =>
@@ -253,6 +253,7 @@ $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.
@@ -284,6 +285,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
@@ -297,9 +303,11 @@ $default =
         array('disabled' => true),
         'plugins' =>
         array('core' => array(
+                            'ActivityVerb' => array(),
                             'AuthCrypt' => array(),
                             'Cronish' => array(),
                             'Favorite' => array(),
+                            'Share' => array(),
                             'LRDD' => array(),
                             'StrictTransportSecurity' => array(),
                         ),
@@ -308,6 +316,7 @@ $default =
                             'AntiBrute' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
+                            'DefaultLayout' => array(),
                             'Directory' => array(),
                             'DirectMessage' => array(),
                             'EmailAuthentication' => array(),