keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hide blocklist from anonymous users on closed registration nodes

Browse source
This commit is contained in:
Hypolite Petovan 2023-07-08 21:18:27 -04:00
parent f20caf4c3a
commit 9f943650a9
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Module/Friendica.php
View file

@ -29,6 +29,7 @@ use Friendica\Core\Hook;
use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\PostUpdate; use Friendica\Database\PostUpdate;
use Friendica\Model\User; use Friendica\Model\User;
@ -47,13 +48,16 @@ class Friendica extends BaseModule
private $config; private $config;
/** @var IManageKeyValuePairs */ /** @var IManageKeyValuePairs */
private $keyValue; private $keyValue;
/** @var IHandleUserSessions */
private $session;
public function __construct(IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) public function __construct(IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{ {
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->config = $config; $this->config = $config;
$this->keyValue = $keyValue; $this->keyValue = $keyValue;
$this->session = $session;
} }
protected function content(array $request = []): string protected function content(array $request = []): string
@ -90,7 +94,8 @@ class Friendica extends BaseModule
$blockList = $this->config->get('system', 'blocklist') ?? []; $blockList = $this->config->get('system', 'blocklist') ?? [];
if (!empty($blockList)) { $register_policy_int = $this->config->get('config', 'register_policy');
if (!empty($blockList) && ($register_policy_int !== Register::CLOSED || $this->session->isAuthenticated())) {
$blocked = [ $blocked = [
'title' => $this->t('On this server the following remote servers are blocked.'), 'title' => $this->t('On this server the following remote servers are blocked.'),
'header' => [ 'header' => [
@ -150,7 +155,7 @@ class Friendica extends BaseModule
Register::OPEN => 'REGISTER_OPEN' Register::OPEN => 'REGISTER_OPEN'
]; ];
$register_policy_int = intval($this->config->get('config', 'register_policy')); $register_policy_int = $this->config->get('config', 'register_policy');
if ($register_policy_int !== Register::CLOSED && $this->config->get('config', 'invitation_only')) { if ($register_policy_int !== Register::CLOSED && $this->config->get('config', 'invitation_only')) {
$register_policy = 'REGISTER_INVITATION'; $register_policy = 'REGISTER_INVITATION';
} else { } else {