Remove callback sneakery by StatusNet

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

diff --git a/lib/default.php b/lib/default.php
index 82ffe80a5db4a51d678950d04a4861a94c756233..65a74d0959f59c08e224d1de7ea09b4132117178 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -20,17 +20,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Config
- * @package   StatusNet
+ * @package   GNUsocial
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-9 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
+ * @link      http://www.gnu.org/software/social/
  */
 
 $default =
     array('site' =>
-        array('name' => 'Just another StatusNet microblog',
-              'nickname' => 'statusnet',
+        array('name' => 'Just another GNU social node',
+              'nickname' => 'gnusocial',
               'wildcard' => null,
               'server' => $_server,
               'theme' => 'neo',
@@ -56,14 +56,13 @@ $default =
               'private' => true,
               'ssl' => 'never',
               'sslserver' => null,
-              'shorturllength' => 30,
               'dupelimit' => 60, // default for same person saying the same thing
               'textlimit' => 0, // in chars; 0 == no limit
               'indent' => true,
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
               'build' => 1, // build number, for code-dependent cache
-              'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
+              '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,7 +85,7 @@ $default =
               'priority' => 'debug', # XXX: currently ignored
               'facility' => LOG_USER),
         'queue' =>
-        array('enabled' => false,
+        array('enabled' => true,
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
               'queue_basename' => '/queue/statusnet/',
@@ -132,11 +131,14 @@ $default =
               'restore' => true,
               'delete' => false,
               'move' => true),
+        'image' =>
+        array('jpegquality' => 85),
         'avatar' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/avatar/',
               'path' => $_path . '/avatar/',
-              'ssl' => null),
+              'ssl' => null,
+              'maxsize' => 300),
         'background' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/background/',
@@ -151,6 +153,9 @@ $default =
               'dir' => null,
               'path'=> null,
               'ssl' => null),
+        'usertheme' =>
+        array('linkcolor' => 'black',
+              'backgroundcolor' => 'black'),
         'theme_upload' =>
         array('enabled' => extension_loaded('zip')),
         'javascript' =>
@@ -167,17 +172,6 @@ $default =
         array('enabled' => false, // whether to throttle edits; false by default
               'count' => 20, // number of allowed messages in timespan
               'timespan' => 600), // timespan for throttling
-        'xmpp' =>
-        array('enabled' => false,
-              'server' => 'INVALID SERVER',
-              'port' => 5222,
-              'user' => 'update',
-              'encryption' => true,
-              'resource' => 'uniquename',
-              'password' => 'blahblahblah',
-              'host' => null, # only set if != server
-              'debug' => false, # print extra debug info
-              'public' => array()), # JIDs of users who want to receive the public stream
         'invite' =>
         array('enabled' => true),
         'tag' =>
@@ -213,10 +207,6 @@ $default =
         'newuser' =>
         array('default' => null,
               'welcome' => null),
-        'snapshot' =>
-        array('run' => 'web',
-              'frequency' => 10000,
-              'reporturl' => 'http://status.net/stats/report'),
         'attachments' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
@@ -294,25 +284,28 @@ $default =
         array('contentlimit' => null),
         'location' =>
         array('share' => 'user', // whether to share location; 'always', 'user', 'never'
-              'sharedefault' => true),
-        'omb' =>
-        array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
+              'sharedefault' => false),
         'logincommand' =>
         array('disabled' => true),
         'plugins' =>
-        array('default' => array('Geonames' => null,
-                                 'ClientSideShorten' => null,
-                                 'StrictTransportSecurity' => null,
-                                 'Bookmark' => null,
-                                 'Event' => null,
-                                 'Poll' => null,
-                                 'QnA' => null,
-                                 'SearchSub' => null,
-                                 'TagSub' => null,
-                                 'OpenID' => null,
-                                 'Directory' => null,
-                                 'ExtendedProfile' => null,
-                                 'Activity' => null),
+        array('core' => array(
+                            'AuthCrypt' => array(),
+                            'Cronish' => array(),
+                            'LRDD' => array(),
+                            'OpportunisticQM' => array(),
+                            'StrictTransportSecurity' => array(),
+                        ),
+              'default' => array(
+                            'Activity' => array(),
+                            'Bookmark' => array(),
+                            'ClientSideShorten' => array(),
+                            'Event' => array(),
+                            'OpenID' => array(),
+                            'Poll' => array(),
+                            'QnA' => array(),
+                            'SearchSub' => array(),
+                            'TagSub' => array(),
+                        ),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               'server' => null,
               'sslserver' => null,
@@ -337,8 +330,8 @@ $default =
               'peopletag' => true,
               'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
         'url' =>
-        array('shortener' => 'ur1.ca',
-              'maxlength' => 25,
+        array('shortener' => 'internal',
+              'maxurllength' => 100,
               'maxnoticelength' => -1),
         'http' => // HTTP client settings when contacting other sites
         array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')