diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-05-17 11:29:58 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-05-17 11:29:58 -0400 |
| commit | 516996fe9fc8d82a5f2dc719a360e4005948326c (patch) | |
| tree | b239e185fd7f804ecc7ea7e0cafc350fa1d8cf0c /lib | |
| parent | 2d581992668b411020cc1dad16d8c05858c31a65 (diff) | |
make config kinda work
darcs-hash:20080517152958-84dde-1170f017a6cf42845d74f75057c923be91404c29.gz
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/lib/common.php b/lib/common.php index 4cef9f0d9..069541026 100644 --- a/lib/common.php +++ b/lib/common.php @@ -29,28 +29,32 @@ define('MAX_AVATAR_SIZE', 256 * 1024); # global configuration object +require_once('PEAR.php'); +require_once('DB_DataObject.php'); + // default configuration, overwritten in config.php $config = array('site' => - array('name' => 'Just another µB', + array('name' => 'Just another Laconica microblog', 'server' => 'localhost', 'path' => '/'), 'avatar' => array('directory' => INSTALLDIR . 'files', 'path' => '/files'), - 'dsn' => - array('phptype' => 'mysql', - 'username' => 'stoica', - 'password' => 'apasswd', - 'hostspec' => 'localhost', - 'database' => 'thedb') - 'dboptions' => - array('debug' => 2, - 'portability' => DB_PORTABILITY_ALL)); + 'db' => &PEAR::getStaticProperty('DB_DataObject','options'), +); + +$config['db'] = + array('database' => 'YOU HAVE TO SET THIS IN config.php', + 'schema_location' => $INSTALLDIR . '/classes', + 'class_location' => $INSTALLDIR . '/classes', + 'require_prefix' => 'classes/', + 'class_prefix' => '', + 'db_driver' => 'MDB2', + 'quote_identifiers' => false); require_once(INSTALLDIR . '/config.php'); -require_once('DB.php'); # Show a server error |