Twitter-compatible API: public_timeline.xml more complete

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

diff --git a/lib/common.php b/lib/common.php
index 9d321f27d4800170d82b216306d828727ea37ebc..25dbbf341c6e00135c054b4d6198296f5c14af68 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -26,6 +26,8 @@ define('AVATAR_STREAM_SIZE', 48);
 define('AVATAR_MINI_SIZE', 24);
 define('MAX_AVATAR_SIZE', 256 * 1024);
 
+define_syslog_variables();
+
 # global configuration object
 
 require_once('PEAR.php');
@@ -42,16 +44,14 @@ $config =
                          'path' => '/',
                          'logfile' => NULL,
                          'fancy' => false,
-                         'email' => $_SERVER['SERVER_ADMIN'],
+                     'email' => 
+                     array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
                          'broughtby' => NULL,
+                         'timezone' => 'UTC',
                          'broughtbyurl' => NULL),
                'syslog' =>
                array('appname' => 'laconica', # for syslog
                          'priority' => 'debug'), # XXX: currently ignored
-               'tag' =>
-               array('authority' => 'INVALID TAG',
-                         'date' => 'PUT A DATE HERE',
-                         'prefix' => ''),
                'queue' =>
                array('enabled' => false),
                'license' =>
@@ -63,6 +63,10 @@ $config =
                          'params' => NULL),
                'nickname' =>
                array('blacklist' => array()),
+               'avatar' =>
+               array('server' => NULL),
+               'theme' =>
+               array('server' => NULL),
                'xmpp' =>
                array('enabled' => false,
                          'server' => 'INVALID SERVER',
@@ -70,7 +74,9 @@ $config =
                          'user' => 'update',
                          'resource' => 'uniquename',
                          'password' => 'blahblahblah',
-                         'host' => NULL), # only set if != server
+                         'host' => NULL, # only set if != server
+                         'debug' => false, # print extra debug info
+                         'public' => array()), # JIDs of users who want to receive the public stream
                );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
@@ -85,6 +91,11 @@ $config['db'] =
                'quote_identifiers' => false);
 
 require_once(INSTALLDIR.'/config.php');
+
+if (function_exists('date_default_timezone_set') && $config['site']['timezone']) {
+       date_default_timezone_set($config['site']['timezone']);
+}
+
 require_once(INSTALLDIR.'/lib/util.php');
 require_once(INSTALLDIR.'/lib/action.php');
 require_once(INSTALLDIR.'/lib/theme.php');