Merge branch '0.7.x' into 0.8.x

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

diff --git a/lib/common.php b/lib/common.php
index a2f9b9bfe73f1fdf5deed09fc892997f2144ba4c..041459cf3462b7804bf56042afe290dc1ef41a23 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,12 +19,11 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.7.0');
+define('LACONICA_VERSION', '0.7.1');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
 define('AVATAR_MINI_SIZE', 24);
-define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
@@ -50,14 +49,29 @@ require_once('DB/DataObject/Cast.php'); # for dates
 
 require_once(INSTALLDIR.'/lib/language.php');
 
+// This gets included before the config file, so that admin code and plugins
+// can use it
+
+require_once(INSTALLDIR.'/lib/event.php');
+require_once(INSTALLDIR.'/lib/plugin.php');
+
+// try to figure out where we are
+
+$_server = array_key_exists('SERVER_NAME', $_SERVER) ?
+  strtolower($_SERVER['SERVER_NAME']) :
+  null;
+$_path = array_key_exists('SCRIPT_NAME', $_SERVER) ?
+  substr($_SERVER['SCRIPT_NAME'], 1, strrpos($_SERVER['SCRIPT_NAME'], '/') - 1) :
+  null;
+
 // default configuration, overwritten in config.php
 
 $config =
   array('site' =>
         array('name' => 'Just another Laconica microblog',
-              'server' => 'localhost',
+              'server' => $_server,
               'theme' => 'default',
-              'path' => '/',
+              'path' => $_path,
               'logfile' => null,
               'fancy' => false,
               'locale_path' => INSTALLDIR.'/locale',
@@ -150,7 +164,26 @@ if (function_exists('date_default_timezone_set')) {
     date_default_timezone_set('UTC');
 }
 
-require_once(INSTALLDIR.'/config.php');
+// From most general to most specific:
+// server-wide, then vhost-wide, then for a path,
+// finally for a dir (usually only need one of the last two).
+
+$_config_files = array('/etc/laconica/laconica.php',
+                  '/etc/laconica/'.$_server.'.php');
+
+if (strlen($_path) > 0) {
+    $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
+}
+
+$_config_files[] = INSTALLDIR.'/config.php';
+
+foreach ($_config_files as $_config_file) {
+    if (file_exists($_config_file)) {
+        include_once($_config_file);
+    }
+}
+
+// XXX: how many of these could be auto-loaded on use?
 
 require_once('Validate.php');
 require_once('markdown.php');
@@ -163,6 +196,9 @@ require_once(INSTALLDIR.'/lib/subs.php');
 require_once(INSTALLDIR.'/lib/Shorturl_api.php');
 require_once(INSTALLDIR.'/lib/twitter.php');
 
+require_once(INSTALLDIR.'/lib/clientexception.php');
+require_once(INSTALLDIR.'/lib/serverexception.php');
+
 // XXX: other formats here
 
 define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
@@ -177,3 +213,7 @@ function __autoload($class)
         require_once(INSTALLDIR.'/lib/' . strtolower($class) . '.php');
     }
 }
+
+// Give plugins a chance to initialize in a fully-prepared environment
+
+Event::handle('InitializePlugin');