add sms broadcast to broadcasting

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

diff --git a/lib/common.php b/lib/common.php
index 14fb2093fae7f022a2032ce1ca76b2ddccb46a29..e7d69303c83f8ff749c4dd5c6079ea7a485627d9 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,13 +19,15 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.4.3');
+define('LACONICA_VERSION', '0.4.4');
 
 define('AVATAR_PROFILE_SIZE', 96);
 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');
@@ -45,6 +47,7 @@ $config =
                      'email' => 
                      array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
                          'broughtby' => NULL,
+                         'timezone' => 'UTC',
                          'broughtbyurl' => NULL),
                'syslog' =>
                array('appname' => 'laconica', # for syslog
@@ -62,6 +65,8 @@ $config =
                array('blacklist' => array()),
                'avatar' =>
                array('server' => NULL),
+               'theme' =>
+               array('server' => NULL),
                'xmpp' =>
                array('enabled' => false,
                          'server' => 'INVALID SERVER',
@@ -70,7 +75,8 @@ $config =
                          'resource' => 'uniquename',
                          'password' => 'blahblahblah',
                          'host' => NULL, # only set if != server
-                         'debug' => false), # print extra debug info
+                         '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');
@@ -100,5 +111,6 @@ require_once(INSTALLDIR.'/classes/Confirm_address.php');
 require_once(INSTALLDIR.'/classes/Remember_me.php');
 require_once(INSTALLDIR.'/classes/Queue_item.php');
 require_once(INSTALLDIR.'/classes/Reply.php');
+require_once(INSTALLDIR.'/classes/Sms_carrier.php');
 
 require_once('markdown.php');