X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=25dbbf341c6e00135c054b4d6198296f5c14af68;hb=902bab5818123a8e8fd6e10c7a49f16d050d2b0c;hp=c0921b662b89bcabb78b2456ac7c6ca92371ca61;hpb=c265587612231dc8b556fd9792821fb03afe9f38;p=quix0rs-gnu-social.git

diff --git a/lib/common.php b/lib/common.php
index c0921b662b..25dbbf341c 100644
--- 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');
@@ -45,14 +47,11 @@ $config =
 		      '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' =>
@@ -64,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',
@@ -72,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');
@@ -87,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');