double-cache to get newer items

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

diff --git a/lib/common.php b/lib/common.php
index d1bab51a64aa14b8412916d4020189f3193bd1e9..2ab9c616c47ad9da218e2d85e0bb67fa1f937330 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.5.0');
+define('LACONICA_VERSION', '0.6.2');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -28,6 +28,13 @@ define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
 
+define('FOREIGN_NOTICE_SEND', 1);
+define('FOREIGN_NOTICE_RECV', 2);
+define('FOREIGN_NOTICE_SEND_REPLY', 4);
+
+define('FOREIGN_FRIEND_SEND', 1);
+define('FOREIGN_FRIEND_RECV', 2);
+
 define_syslog_variables();
 
 # append our extlib dir as the last-resort place to find libs
@@ -60,7 +67,8 @@ $config =
                          'broughtby' => NULL,
                          'timezone' => 'UTC',
                          'broughtbyurl' => NULL,
-                         'closed' => false),
+                         'closed' => false,
+                         'inviteonly' => false),
                'syslog' =>
                array('appname' => 'laconica', # for syslog
                          'priority' => 'debug'), # XXX: currently ignored
@@ -78,7 +86,8 @@ $config =
                'avatar' =>
                array('server' => NULL),
                'public' =>
-               array('localonly' => true),
+               array('localonly' => true,
+                         'blacklist' => array()),
                'theme' =>
                array('server' => NULL),
                'xmpp' =>
@@ -98,10 +107,14 @@ $config =
                array('piddir' => '/var/run',
                          'user' => false,
                          'group' => false),
+               'integration' =>
+               array('source' => 'Laconica'), # source attribute for Twitter
                'memcached' => 
                array('enabled' => false,
                          'server' => 'localhost',
-                         'port' => 11211)
+                         'port' => 11211),
+               'inboxes' =>
+               array('enabled' => true), # on by default for new sites
                );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
@@ -114,7 +127,8 @@ $config['db'] =
                'class_prefix' => '',
                'mirror' => NULL,
         'db_driver' => 'DB', # XXX: JanRain libs only work with DB
-               'quote_identifiers' => false);
+               'quote_identifiers' => false,
+               'type' => 'mysql' );
 
 if (function_exists('date_default_timezone_set')) {
        /* Work internally in UTC */
@@ -130,6 +144,8 @@ require_once(INSTALLDIR.'/lib/util.php');
 require_once(INSTALLDIR.'/lib/action.php');
 require_once(INSTALLDIR.'/lib/theme.php');
 require_once(INSTALLDIR.'/lib/mail.php');
+require_once(INSTALLDIR.'/lib/subs.php');
+require_once(INSTALLDIR.'/lib/Shorturl_api.php');
 
 function __autoload($class) {
        if ($class == 'OAuthRequest') {