switch password and id in munge_password

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

diff --git a/lib/common.php b/lib/common.php
index 66de209d66d1d9fdd9868380962cdf14a70e9475..34c024ece0b49b6912b9773ab24f3e03bf113363 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* XXX: break up into separate modules (HTTP, HTML, user, files) */
-
 if (!defined('LACONICA')) { exit(1); }
 
+define('LACONICA_VERSION', '0.3.0');
+
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
 define('AVATAR_MINI_SIZE', 24);
@@ -38,15 +38,24 @@ $config =
   array('site' =>
                array('name' => 'Just another Laconica microblog',
                          'server' => 'localhost',
-                         'path' => '/'),
+                         'theme' => 'default',
+                         'path' => '/',
+                         'fancy' => false),
+               'syslog' =>
+               array('appname' => 'laconica', # for syslog
+                         'priority' => 'debug'), # XXX: currently ignored
+               'tag' =>
+               array('authority' => 'INVALID TAG',
+                         'date' => 'PUT A DATE HERE',
+                         'prefix' => ''),
                'license' =>
-               array('url' => 'http://creativecommons.org/license/by/3.0/',
+               array('url' => 'http://creativecommons.org/licenses/by/3.0/',
                          'title' => 'Creative Commons Attribution 3.0',
                          'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
-               'avatar' =>
-               array('directory' => INSTALLDIR . '/avatar',
-                         'path' => '/avatar')
-);
+               'mail' =>
+               array('backend' => 'mail',
+                         'params' => NULL)
+               );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
 
@@ -62,6 +71,8 @@ $config['db'] =
 require_once(INSTALLDIR.'/config.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.'/classes/Avatar.php');
 require_once(INSTALLDIR.'/classes/Notice.php');