GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use addPlugin! (esp. XMPP folks should do this)

Browse Source 
If you're using XMPP by setting $config['xmpp'][*] then you should do:

    addPlugin('Xmpp', $config['xmpp']);

because setting it directly in $config[''] won't do anything.

Also, default resource for XMPP is now 'gnusocial'. If you want something
more random, set it in your addPlugin config array.
This commit is contained in:
Mikael Nordfeldth 2013-10-30 12:25:01 +01:00
parent 8dafce34c3
commit e45edd6ae2
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/default.php
View File

@ -172,17 +172,6 @@ $default =
array('enabled' => false, // whether to throttle edits; false by default
'count' => 20, // number of allowed messages in timespan
'timespan' => 600), // timespan for throttling
'xmpp' =>
array('enabled' => false,
'server' => 'INVALID SERVER',
'port' => 5222,
'user' => 'update',
'encryption' => true,
'resource' => 'uniquename',
'password' => 'blahblahblah',
'host' => null, # only set if != server
'debug' => false, # print extra debug info
'public' => array()), # JIDs of users who want to receive the public stream
'invite' =>
array('enabled' => true),
'tag' =>

27
lib/statusnet.php
View File

@ -379,33 +379,6 @@ class StatusNet
$config_files);
}
// Backwards compatibility
if (array_key_exists('memcached', $config)) {
if ($config['memcached']['enabled']) {
addPlugin('Memcache', array('servers' => $config['memcached']['server']));
}
if (!empty($config['memcached']['base'])) {
$config['cache']['base'] = $config['memcached']['base'];
}
}
if (array_key_exists('xmpp', $config)) {
if ($config['xmpp']['enabled']) {
addPlugin('xmpp', array(
'server' => $config['xmpp']['server'],
'port' => $config['xmpp']['port'],
'user' => $config['xmpp']['user'],
'resource' => $config['xmpp']['resource'],
'encryption' => $config['xmpp']['encryption'],
'password' => $config['xmpp']['password'],
'host' => $config['xmpp']['host'],
'debug' => $config['xmpp']['debug'],
'public' => $config['xmpp']['public']
));
}
}
// Check for database server; must exist!
if (empty($config['db']['database'])) {

2
plugins/Xmpp/XmppPlugin.php
View File

@ -49,7 +49,7 @@ class XmppPlugin extends ImPlugin
public $server = null;
public $port = 5222;
public $user = 'update';
public $resource = null;
public $resource = 'gnusocial';
public $encryption = true;
public $password = null;
public $host = null; // only set if != server