X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fdefault.php;h=d2270fa6a562532505def19018a896b1c2a0b172;hb=0fa00d510626f9131ca94edaf303b4c09691259f;hp=65a74d0959f59c08e224d1de7ea09b4132117178;hpb=4e40597139e790482e721fe371acd36dd85b9e48;p=quix0rs-gnu-social.git

diff --git a/lib/default.php b/lib/default.php
index 65a74d0959..d2270fa6a5 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -62,7 +62,6 @@ $default =
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
               'build' => 1, // build number, for code-dependent cache
-              'minify' => false, // true to use the minified versions of JS files; false to use orig files. Can aid during development
               ),
         'db' =>
           array('database' => null, // must be set
@@ -86,6 +85,7 @@ $default =
               'facility' => LOG_USER),
         'queue' =>
         array('enabled' => true,
+              'daemon' => false, # Use queuedaemon. Default to false
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
               'queue_basename' => '/queue/statusnet/',
@@ -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>,
@@ -214,47 +213,50 @@ $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_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' => 500,     // thumbs bigger than this will not be generated
+              'width' => 500,
+              'height' => 250),
         'application' =>
         array('desclimit' => null),
         'group' =>
@@ -299,6 +301,7 @@ $default =
                             'Activity' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
+                            'EmailAuthentication' => array(),
                             'Event' => array(),
                             'OpenID' => array(),
                             'Poll' => array(),