Merge branch 'dbconfig' into 0.9.x

Conflicts:
	lib/common.php

diff --cc lib/common.php
index 84ee5be15f2332d5f63572c0880605df91b7184d,d95622ecd58de13dd78ac37e90f5a5efd8f95aa1..067a5a2a61bafcdfb8a6cb42c7078e1dcf58298b
--- 1/lib/common.php
--- 2/lib/common.php
+++ b/lib/common.php
@@@ -381,13 -371,25 +383,31 @@@ if ($_db_name != 'laconica' && !array_k
      $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini';
  }
  
 +// Ignore openidonly if OpenID is disabled
 +
 +if (!$config['openid']['enabled']) {
 +    $config['site']['openidonly'] = false;
 +}
 +
+ function __autoload($cls)
+ {
+     if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
+         require_once(INSTALLDIR.'/classes/' . $cls . '.php');
+     } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($cls) . '.php')) {
+         require_once(INSTALLDIR.'/lib/' . strtolower($cls) . '.php');
+     } else if (mb_substr($cls, -6) == 'Action' &&
+                file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php')) {
+         require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
+     } else if ($cls == 'OAuthRequest') {
+         require_once('OAuth.php');
+     } else {
+         Event::handle('Autoload', array(&$cls));
+     }
+ }
+ 
  // XXX: how many of these could be auto-loaded on use?
+ // XXX: note that these files should not use config options
+ // at compile time since DB config options are not yet loaded.
  
  require_once 'Validate.php';
  require_once 'markdown.php';