Родитель
2e9bf4ee19
Коммит
35d7e2b8e0
|
@ -189,7 +189,7 @@ class SettingsController extends Controller
|
||||||
$options[$key] = $val;
|
$options[$key] = $val;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($options['disabled'] === '') {
|
if (array_key_exists('disabled', $options) && $options['disabled'] === '') {
|
||||||
unset($options['disabled']);
|
unset($options['disabled']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ class Personal implements ISettings
|
||||||
$parameters['loginForm'] = 'default';
|
$parameters['loginForm'] = 'default';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_array($options['xmpp'])) {
|
if (array_key_exists('xmpp', $options) && is_array($options['xmpp'])) {
|
||||||
if (!empty($options['xmpp']['node'])) {
|
if (!empty($options['xmpp']['node'])) {
|
||||||
$node = $options['xmpp']['node'];
|
$node = $options['xmpp']['node'];
|
||||||
$parameters['xmppNode'] = $options['xmpp']['node'];
|
$parameters['xmppNode'] = $options['xmpp']['node'];
|
||||||
|
@ -81,7 +81,7 @@ class Personal implements ISettings
|
||||||
$xmppOverwrite = $this->config->getAppValue('ojsxc', Config::XMPP_ALLOW_OVERWRITE);
|
$xmppOverwrite = $this->config->getAppValue('ojsxc', Config::XMPP_ALLOW_OVERWRITE);
|
||||||
|
|
||||||
$parameters['xmppUrl'] = $this->config->getAppValue('ojsxc', Config::XMPP_URL);
|
$parameters['xmppUrl'] = $this->config->getAppValue('ojsxc', Config::XMPP_URL);
|
||||||
$parameters['externalConnectable'] = Application::getServerType() !== Application.INTERNAL;
|
$parameters['externalConnectable'] = Application::getServerType() !== Application::INTERNAL;
|
||||||
$parameters['allowToOverwriteXMPPConfig'] = $xmppOverwrite === 'true' || $xmppOverwrite === true || $xmppOverwrite === 1 || $xmppOverwrite === '1';
|
$parameters['allowToOverwriteXMPPConfig'] = $xmppOverwrite === 'true' || $xmppOverwrite === true || $xmppOverwrite === 1 || $xmppOverwrite === '1';
|
||||||
$parameters['jid'] = $node . '@' . $domain;
|
$parameters['jid'] = $node . '@' . $domain;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче