bring lib/noticelist.php into line with PEAR code standards

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

diff --git a/lib/common.php b/lib/common.php
index def18337535830adb6bfdf1bf706c15a347d2b1f..5a28c309133a54648024a246b85cb2689b65f9ea 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.6.2');
+define('LACONICA_VERSION', '0.6.4.1');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -27,6 +27,7 @@ define('AVATAR_MINI_SIZE', 24);
 define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
+define('PROFILES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);
@@ -40,7 +41,7 @@ define_syslog_variables();
 # append our extlib dir as the last-resort place to find libs
 
 set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
-                                
+
 # global configuration object
 
 require_once('PEAR.php');
@@ -68,7 +69,8 @@ $config =
                          'timezone' => 'UTC',
                          'broughtbyurl' => NULL,
                          'closed' => false,
-                         'inviteonly' => false),
+                         'inviteonly' => false,
+              'private' => false),
                'syslog' =>
                array('appname' => 'laconica', # for syslog
                          'priority' => 'debug'), # XXX: currently ignored
@@ -84,6 +86,8 @@ $config =
                'nickname' =>
                array('blacklist' => array(),
                          'featured' => array()),
+               'profile' =>
+               array('banned' => array()),
                'avatar' =>
                array('server' => NULL),
                'public' =>
@@ -91,6 +95,10 @@ $config =
                          'blacklist' => array()),
                'theme' =>
                array('server' => NULL),
+               'throttle' =>
+        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',
@@ -102,15 +110,21 @@ $config =
                          'host' => NULL, # only set if != server
                          'debug' => false, # print extra debug info
                          'public' => array()), # JIDs of users who want to receive the public stream
+        'sphinx' =>
+        array('enabled' => false,
+              'server' => 'localhost',
+              'port' => 3312),
                'tag' =>
                array('dropoff' => 864000.0),
+               'popular' =>
+               array('dropoff' => 864000.0),
                'daemon' =>
                array('piddir' => '/var/run',
                          'user' => false,
                          'group' => false),
                'integration' =>
                array('source' => 'Laconica'), # source attribute for Twitter
-               'memcached' => 
+               'memcached' =>
                array('enabled' => false,
                          'server' => 'localhost',
                          'port' => 11211),