]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - lib/default.php
Merge remote-tracking branch 'upstream/master'
[quix0rs-gnu-social.git] / lib / default.php
index c5794565a302f181c740d8b00c02ec1785021054..a660c6b33dcd79b690ed8cd83161664a859afd9d 100644 (file)
@@ -100,7 +100,6 @@ $default =
               'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
               'spawndelay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup
               'debug_memory' => false, // true to spit memory usage to log
-              'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue
               'breakout' => array(), // List queue specifiers to break out when using Stomp queue.
                                      // Default will share all queues for all sites within each group.
                                      // Specify as <group>/<queue> or <group>/<queue>/<site>,
@@ -132,7 +131,7 @@ $default =
               'delete' => false,
               'move' => true),
         'image' =>
-        array('jpegquality' => 85),
+        array('jpegquality' => 95),
         'avatar' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/avatar/',
@@ -214,47 +213,51 @@ $default =
               'sslserver' => null,
               'sslpath' => null,
               'ssl' => null,
-              'supported' => array('image/png',
-                                   'image/jpeg',
-                                   'image/gif',
-                                   'image/svg+xml',
-                                   'audio/mpeg',
-                                   'audio/x-speex',
-                                   'application/ogg',
-                                   'application/pdf',
-                                   'application/vnd.oasis.opendocument.text',
-                                   'application/vnd.oasis.opendocument.text-template',
-                                   'application/vnd.oasis.opendocument.graphics',
-                                   'application/vnd.oasis.opendocument.graphics-template',
-                                   'application/vnd.oasis.opendocument.presentation',
-                                   'application/vnd.oasis.opendocument.presentation-template',
-                                   'application/vnd.oasis.opendocument.spreadsheet',
-                                   'application/vnd.oasis.opendocument.spreadsheet-template',
-                                   'application/vnd.oasis.opendocument.chart',
-                                   'application/vnd.oasis.opendocument.chart-template',
-                                   'application/vnd.oasis.opendocument.image',
-                                   'application/vnd.oasis.opendocument.image-template',
-                                   'application/vnd.oasis.opendocument.formula',
-                                   'application/vnd.oasis.opendocument.formula-template',
-                                   'application/vnd.oasis.opendocument.text-master',
-                                   'application/vnd.oasis.opendocument.text-web',
-                                   'application/x-zip',
-                                   'application/zip',
-                                   'text/plain',
-                                   'video/mpeg',
-                                   'video/mp4',
-                                   'video/quicktime',
-                                   'video/mpeg'),
+              'supported' => array(
+                                'application/vnd.oasis.opendocument.chart'                  => 'odc',
+                                'application/vnd.oasis.opendocument.formula'                => 'odf',
+                                'application/vnd.oasis.opendocument.graphics'               => 'odg',
+                                'application/vnd.oasis.opendocument.graphics-template'      => 'otg',
+                                'application/vnd.oasis.opendocument.image'                  => 'odi',
+                                'application/vnd.oasis.opendocument.presentation'           => 'odp',
+                                'application/vnd.oasis.opendocument.presentation-template'  => 'otp',
+                                'application/vnd.oasis.opendocument.spreadsheet'            => 'ods',
+                                'application/vnd.oasis.opendocument.spreadsheet-template'   => 'ots',
+                                'application/vnd.oasis.opendocument.text'                   => 'odt',
+                                'application/vnd.oasis.opendocument.text-master'            => 'odm',
+                                'application/vnd.oasis.opendocument.text-template'          => 'ott',
+                                'application/vnd.oasis.opendocument.text-web'               => 'oth',
+                                'application/pdf'   => 'pdf',
+                                'application/zip'   => 'zip',
+                                'image/png'         => 'png',
+                                'image/jpeg'        => 'jpg',
+                                'image/gif'         => 'gif',
+                                'image/svg+xml'     => 'svg',
+                                'image/vnd.microsoft.icon'  => 'ico',
+                                'audio/ogg'         => 'ogg',
+                                'audio/mpeg'        => 'mpg',
+                                'audio/x-speex'     => 'spx',
+                                'application/ogg'   => 'ogx',
+                                'text/plain'        => 'txt',
+                                'video/mpeg'        => 'mpeg',
+                                'video/mp4'         => 'mp4',
+                                'video/ogg'         => 'ogv',
+                                'video/quicktime'   => 'mov',
+                                'video/webm'        => 'webm',
+                                ),
               'file_quota' => 5000000,
               'user_quota' => 50000000,
               'monthly_quota' => 15000000,
               'uploads' => true,
-              'filecommand' => '/usr/bin/file',
+              '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
-              'thumb_width' => 100,
-              'thumb_height' => 75,
               '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
+              'width' => 450,
+              'height' => 600),
         'application' =>
         array('desclimit' => null),
         'group' =>
@@ -267,7 +270,7 @@ $default =
               'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
               'desclimit' => null),
         'oembed' =>
-        array('endpoint' => 'https://noembed.com/embed/',
+        array('endpoint' => null,   // 'https://noembed.com/embed/' for proxied oEmbed data
               'order' => array('built-in', 'well-known', 'service', 'discovery'),
         ),
         'search' =>
@@ -291,20 +294,27 @@ $default =
         array('core' => array(
                             'AuthCrypt' => array(),
                             'Cronish' => array(),
+                            'Favorite' => array(),
                             'LRDD' => array(),
-                            'OpportunisticQM' => array(),
                             'StrictTransportSecurity' => array(),
                         ),
               'default' => array(
                             'Activity' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
+                            'Directory' => array(),
+                            'DirectMessage' => array(),
+                            'EmailAuthentication' => array(),
                             'Event' => array(),
+                            'Oembed' => array(),
                             'OpenID' => array(),
+                            'OpportunisticQM' => array(),
+                            'OStatus' => array(),
                             'Poll' => array(),
                             'QnA' => array(),
                             'SearchSub' => array(),
                             'TagSub' => array(),
+                            'WebFinger' => array(),
                         ),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               'server' => null,