X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=e7d69303c83f8ff749c4dd5c6079ea7a485627d9;hb=3372a98f8eddd619a4a1fa7108b726e3f26acfcc;hp=d2e7e2ed50784401f38f9bdb61ed7351fb890930;hpb=7d9372ec502ef681637eb48dac7a4444c9a86640;p=quix0rs-gnu-social.git

diff --git a/lib/common.php b/lib/common.php
index d2e7e2ed50..e7d69303c8 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,13 +19,15 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.3.4');
+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');
@@ -40,14 +42,18 @@ $config =
 			  'server' => 'localhost',
 			  'theme' => 'default',
 			  'path' => '/',
-			  'fancy' => false),
+			  'logfile' => NULL,
+			  'fancy' => false,
+		      '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' =>
 		array('url' => 'http://creativecommons.org/licenses/by/3.0/',
 			  'title' => 'Creative Commons Attribution 3.0',
@@ -57,13 +63,20 @@ $config =
 			  'params' => NULL),
 		'nickname' =>
 		array('blacklist' => array()),
+		'avatar' =>
+		array('server' => NULL),
+		'theme' =>
+		array('server' => NULL),
 		'xmpp' =>
 		array('enabled' => false,
 			  'server' => 'INVALID SERVER',
 			  'port' => 5222,
 			  'user' => 'update',
 			  'resource' => 'uniquename',
-			  'password' => 'blahblahblah'),
+			  'password' => 'blahblahblah',
+			  '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');
@@ -78,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');
@@ -90,3 +108,9 @@ require_once(INSTALLDIR.'/classes/Remote_profile.php');
 require_once(INSTALLDIR.'/classes/Subscription.php');
 require_once(INSTALLDIR.'/classes/User.php');
 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');