More configuration options for location sharing

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

diff --git a/lib/default.php b/lib/default.php
index 9f3d4b1f9d858ea78fb2a8c5c745a5e5f4f3eaa8..8a70ed3fa15d0672899f0d4c22e68abf062b7349 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -53,6 +53,7 @@ $default =
               'shorturllength' => 30,
               'dupelimit' => 60, # default for same person saying the same thing
               'textlimit' => 140,
+              'indent' => true,
               ),
         'db' =>
         array('database' => 'YOU HAVE TO SET THIS IN config.php',
@@ -74,7 +75,7 @@ $default =
         array('enabled' => false,
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
-              'queue_basename' => 'statusnet',
+              'queue_basename' => '/queue/statusnet/',
               'stomp_username' => null,
               'stomp_password' => null,
               ),
@@ -84,7 +85,8 @@ $default =
               'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
         'mail' =>
         array('backend' => 'mail',
-              'params' => null),
+              'params' => null,
+              'domain_check' => true),
         'nickname' =>
         array('blacklist' => array(),
               'featured' => array()),
@@ -124,10 +126,6 @@ $default =
               'public' => array()), # JIDs of users who want to receive the public stream
         'invite' =>
         array('enabled' => true),
-        'sphinx' =>
-        array('enabled' => false,
-              'server' => 'localhost',
-              'port' => 3312),
         'tag' =>
         array('dropoff' => 864000.0),
         'popular' =>
@@ -140,21 +138,21 @@ $default =
         array('enabled' => true),
         'sms' =>
         array('enabled' => true),
-        'twitterbridge' =>
+        'twitterimport' =>
         array('enabled' => false),
         'integration' =>
         array('source' => 'StatusNet', # source attribute for Twitter
               'taguri' => $_server.',2009'), # base for tag URIs
-       'twitter' =>
-       array('enabled'       => true,
-           'consumer_key'    => null,
-           'consumer_secret' => null),
+        'twitter' =>
+        array('enabled'       => true,
+              'consumer_key'    => null,
+              'consumer_secret' => null),
         'memcached' =>
         array('enabled' => false,
               'server' => 'localhost',
               'base' => null,
               'port' => 11211),
-               'ping' =>
+        'ping' =>
         array('notify' => array()),
         'inboxes' =>
         array('enabled' => true), # ignored after 0.9.x
@@ -200,12 +198,12 @@ $default =
                                    'video/mp4',
                                    'video/quicktime',
                                    'video/mpeg'),
-        'file_quota' => 5000000,
-        'user_quota' => 50000000,
-        'monthly_quota' => 15000000,
-        'uploads' => true,
-        'filecommand' => '/usr/bin/file',
-        ),
+              'file_quota' => 5000000,
+              'user_quota' => 50000000,
+              'monthly_quota' => 15000000,
+              'uploads' => true,
+              'filecommand' => '/usr/bin/file',
+              ),
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null),
@@ -227,6 +225,11 @@ $default =
         array('contentlimit' => null),
         'message' =>
         array('contentlimit' => null),
-        'http' =>
-        array('client' => 'curl'), // XXX: should this be the default?
+        '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
+        'logincommand' =>
+        array('disabled' => true),
         );