csrf protection in userauthorization

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

diff --git a/lib/common.php b/lib/common.php
index 9269ace89dbb1c6bbb0680cea5d5f969d2895d6f..e4c8e9032a9bc66c1e78a5a46c09648e62026928 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -30,6 +30,10 @@ define('NOTICES_PER_PAGE', 20);
 
 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');
@@ -73,6 +77,8 @@ $config =
                array('blacklist' => array()),
                'avatar' =>
                array('server' => NULL),
+               'public' =>
+               array('localonly' => true),
                'theme' =>
                array('server' => NULL),
                'xmpp' =>
@@ -80,6 +86,7 @@ $config =
                          'server' => 'INVALID SERVER',
                          'port' => 5222,
                          'user' => 'update',
+                         'encryption' => true,
                          'resource' => 'uniquename',
                          'password' => 'blahblahblah',
                          'host' => NULL, # only set if != server
@@ -101,24 +108,26 @@ $config['db'] =
         'db_driver' => 'DB', # XXX: JanRain libs only work with DB
                'quote_identifiers' => false);
 
-require_once(INSTALLDIR.'/config.php');
-
-require_once('Validate.php');
-
 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');