Merge branch 'master' into social-master

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

diff --git a/lib/default.php b/lib/default.php
index 42278612cdefd1ec4130986cdf6c558dbbe14e99..72b82e820fa3026a39feae26da52529d513f6e66 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,
@@ -57,7 +57,7 @@ $default =
               '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,12 +126,13 @@ $default =
         'profile' =>
         array('banned' => array(),
               'biolimit' => null,
+              'changenick' => false,
               'backup' => true,
               'restore' => true,
               'delete' => false,
               'move' => true),
         'image' =>
-        array('jpegquality' => 85),
+        array('jpegquality' => 95),
         'avatar' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/avatar/',
@@ -210,6 +211,7 @@ $default =
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
               'path' => $_path . '/file/',
+              'chmod' => 0644,        // Access rights (chmod) for any attachments
               'sslserver' => null,
               'sslpath' => null,
               'ssl' => null,
@@ -257,7 +259,8 @@ $default =
         array('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),
+              'height' => 600,
+              'animated' => false), // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
         'application' =>
         array('desclimit' => null),
         'group' =>