better handling of staticGet

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

diff --git a/lib/common.php b/lib/common.php
index 13c7d0d458048cae70a9025d39f7f8b5b2e6bc82..015ecd639ad0952840a444bb3ba06a3b7fde5ac4 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.0');
 
 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
@@ -86,6 +93,7 @@ $config =
                          'server' => 'INVALID SERVER',
                          'port' => 5222,
                          'user' => 'update',
+                         'encryption' => true,
                          'resource' => 'uniquename',
                          'password' => 'blahblahblah',
                          'host' => NULL, # only set if != server
@@ -93,6 +101,16 @@ $config =
                          'public' => array()), # JIDs of users who want to receive the public stream
                'tag' =>
                array('dropoff' => 864000.0),
+               'daemon' =>
+               array('piddir' => '/var/run',
+                         'user' => false,
+                         'group' => false),
+               'integration' =>
+               array('source' => 'Laconica'), # source attribute for Twitter
+               'memcached' => 
+               array('enabled' => false,
+                         'server' => 'localhost',
+                         'port' => 11211)
                );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
@@ -105,7 +123,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 */