X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=fe4c846c92047ec438c2ba5d21c8acda7e515b76;hb=e1863951986ba5be173758324a00652bc5af870c;hp=3029893097e246fdd734217b068a8c17236fc164;hpb=f20caf4c3a33025c7cfe799482697386bd9d4b8f;p=friendica.git diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index 3029893097..fe4c846c92 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -26,9 +26,10 @@ use Friendica\BaseModule; use Friendica\Core\Addon; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\System; use Friendica\Database\PostUpdate; use Friendica\Model\User; @@ -47,13 +48,16 @@ class Friendica extends BaseModule private $config; /** @var IManageKeyValuePairs */ 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); $this->config = $config; $this->keyValue = $keyValue; + $this->session = $session; } protected function content(array $request = []): string @@ -90,7 +94,7 @@ class Friendica extends BaseModule $blockList = $this->config->get('system', 'blocklist') ?? []; - if (!empty($blockList)) { + if (!empty($blockList) && ($this->config->get('blocklist', 'public') || $this->session->isAuthenticated())) { $blocked = [ 'title' => $this->t('On this server the following remote servers are blocked.'), 'header' => [ @@ -150,7 +154,7 @@ class Friendica extends BaseModule 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')) { $register_policy = 'REGISTER_INVITATION'; } else {