Browse Source

Fix #773

pull/808/head
Timothée Jaussoin 7 years ago
parent
commit
c86835dcc2
  1. 1
      CHANGELOG.md
  2. 8
      app/widgets/Subscribe/Subscribe.php
  3. 2
      app/widgets/Subscribe/subscribe.tpl

1
CHANGELOG.md

@ -8,6 +8,7 @@ v0.14.2 (trunk)
* Give feedback when a new Communities Server is explored (#804)
* Fix Undefined variable: url in _communitysubscriptions.tpl (#802)
* Fix short columns length in SQL database (#801)
* Fix XMPP whitelist also filter XMPP servers on registration page (#773)
v0.14.1
---------------------------

8
app/widgets/Subscribe/Subscribe.php

@ -19,10 +19,14 @@ class Subscribe extends Base
{
$json = requestURL(MOVIM_API.'servers', 3, false, true);
$json = json_decode($json);
$this->view->assign('config', Configuration::get());
$config = Configuration::get();
$this->view->assign('config', $config);
if (is_object($json) && $json->status == 200) {
$this->view->assign('servers', $json->servers);
$this->view->assign('servers', array_filter((array)$json->servers,
function ($server) use ($config) {
return empty($config->xmppwhitelist) || in_array($server->domain, $config->xmppwhitelist);
}));
}
}
}

2
app/widgets/Subscribe/subscribe.tpl

@ -6,7 +6,7 @@
</li>
</ul>
<ul class="list card shadow active flex">
<ul class="list card active flex thick">
{if="!empty($config->xmppdomain)"}
<li
class="block large"

Loading…
Cancel
Save