X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fcommon.php;h=af1d4f251cbd5be2f18dfb682b0f3bc70764ca77;hb=8deac7248e7db35515d7810491f9136deffa3098;hp=5e8eae6e72284c17d18d54fdce86d0dc3d66919d;hpb=341563d6cdd5e0541a375cbf2b9ce89711c9530d;p=quix0rs-gnu-social.git

diff --git a/lib/common.php b/lib/common.php
index 5e8eae6e72..af1d4f251c 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.4.4');
+define('LACONICA_VERSION', '0.6.1');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -28,8 +28,19 @@ define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
 
+define('FOREIGN_NOTICE_SEND', 1);
+define('FOREIGN_NOTICE_RECV', 2);
+define('FOREIGN_NOTICE_SEND_REPLY', 4);
+
+define('FOREIGN_FRIEND_SEND', 1);
+define('FOREIGN_FRIEND_RECV', 2);
+
 define_syslog_variables();
 
+# append our extlib dir as the last-resort place to find libs
+
+set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
+				 
 # global configuration object
 
 require_once('PEAR.php');
@@ -48,15 +59,16 @@ $config =
 			  'path' => '/',
 			  'logfile' => NULL,
 			  'fancy' => false,
-                          'locale_path' => './locale',
-                          'language' => 'en_US',
-                          'languages' => get_all_languages(),
+			  'locale_path' => INSTALLDIR.'/locale',
+			  'language' => 'en_US',
+			  'languages' => get_all_languages(),
 		      'email' =>
 		      array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
 			  'broughtby' => NULL,
 			  'timezone' => 'UTC',
 			  'broughtbyurl' => NULL,
-			  'closed' => false),
+			  'closed' => false,
+			  'inviteonly' => false),
 		'syslog' =>
 		array('appname' => 'laconica', # for syslog
 			  'priority' => 'debug'), # XXX: currently ignored
@@ -73,6 +85,8 @@ $config =
 		array('blacklist' => array()),
 		'avatar' =>
 		array('server' => NULL),
+		'public' =>
+		array('localonly' => true),
 		'theme' =>
 		array('server' => NULL),
 		'xmpp' =>
@@ -80,11 +94,24 @@ $config =
 			  'server' => 'INVALID SERVER',
 			  'port' => 5222,
 			  'user' => 'update',
+			  'encryption' => true,
 			  'resource' => 'uniquename',
 			  '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
+		'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');
@@ -97,24 +124,29 @@ $config['db'] =
 		'class_prefix' => '',
 		'mirror' => NULL,
         'db_driver' => 'DB', # XXX: JanRain libs only work with DB
-		'quote_identifiers' => false);
-
-require_once(INSTALLDIR.'/config.php');
+		'quote_identifiers' => false,
+		'type' => 'mysql' );
 
 if (function_exists('date_default_timezone_set')) {
 	/* Work internally in UTC */
 	date_default_timezone_set('UTC');
 }
 
+require_once(INSTALLDIR.'/config.php');
+
+require_once('Validate.php');
+require_once('markdown.php');
+
 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 (file_exists(INSTALLDIR.'/classes/' . $class . '.php')) {
+	if ($class == 'OAuthRequest') {
+		require_once('OAuth.php');
+	} else if (file_exists(INSTALLDIR.'/classes/' . $class . '.php')) {
         require_once(INSTALLDIR.'/classes/' . $class . '.php');
     }
 }
-
-require_once('markdown.php');