CSRF protection in user registration

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

diff --git a/lib/common.php b/lib/common.php
index 6db9f91fe4efc757de40b7fff86bbb848a77d788..e4c8e9032a9bc66c1e78a5a46c09648e62026928 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -32,7 +32,7 @@ define_syslog_variables();
 
 # append our extlib dir as the last-resort place to find libs
 
-set_include_path(array_merge(get_include_path(), array(INSTALLDIR . '/extlib/')));
+set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
                                 
 # global configuration object
 
@@ -86,6 +86,7 @@ $config =
                          'server' => 'INVALID SERVER',
                          'port' => 5222,
                          'user' => 'update',
+                         'encryption' => true,
                          'resource' => 'uniquename',
                          'password' => 'blahblahblah',
                          'host' => NULL, # only set if != server
@@ -121,6 +122,7 @@ 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 ($class == 'OAuthRequest') {