Added option to add disable attr to common_checkbox()

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

diff --git a/lib/common.php b/lib/common.php
index 6db9f91fe4efc757de40b7fff86bbb848a77d788..60c820ee6e7586da25bd67591aeba740db70cd88 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);
@@ -32,7 +32,7 @@ define_syslog_variables();
 
 # append our extlib dir as the last-resort place to find libs
 
-set_include_path(array_merge(get_include_path(), array(INSTALLDIR . '/extlib/')));
+set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
                                 
 # global configuration object
 
@@ -86,6 +86,7 @@ $config =
                          'server' => 'INVALID SERVER',
                          'port' => 5222,
                          'user' => 'update',
+                         'encryption' => true,
                          'resource' => 'uniquename',
                          'password' => 'blahblahblah',
                          'host' => NULL, # only set if != server
@@ -93,6 +94,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 +116,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 */
@@ -121,6 +133,7 @@ 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');
 
 function __autoload($class) {
        if ($class == 'OAuthRequest') {