<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
namespace Friendica\Module\Admin\Blocklist;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
-use Friendica\Module\BaseAdminModule;
+use Friendica\DI;
+use Friendica\Module\BaseAdmin;
use Friendica\Util\Strings;
-class Server extends BaseAdminModule
+class Server extends BaseAdmin
{
- public static function post()
+ public static function post(array $parameters = [])
{
- parent::post();
+ self::checkAdminAccess();
if (empty($_POST['page_blocklist_save']) && empty($_POST['page_blocklist_edit'])) {
return;
}
- parent::checkFormSecurityTokenRedirectOnError('/admin/blocklist/server', 'admin_blocklist');
+ self::checkFormSecurityTokenRedirectOnError('/admin/blocklist/server', 'admin_blocklist');
if (!empty($_POST['page_blocklist_save'])) {
// Add new item to blocklist
- $blocklist = Config::get('system', 'blocklist');
+ $blocklist = DI::config()->get('system', 'blocklist');
$blocklist[] = [
'domain' => Strings::escapeTags(trim($_POST['newentry_domain'])),
'reason' => Strings::escapeTags(trim($_POST['newentry_reason']))
];
- Config::set('system', 'blocklist', $blocklist);
- info(L10n::t('Server added to blocklist.') . EOL);
+ DI::config()->set('system', 'blocklist', $blocklist);
+ info(DI::l10n()->t('Server domain pattern added to blocklist.'));
} else {
// Edit the entries from blocklist
$blocklist = [];
];
}
}
- Config::set('system', 'blocklist', $blocklist);
- info(L10n::t('Site blocklist updated.') . EOL);
+ DI::config()->set('system', 'blocklist', $blocklist);
}
- self::getApp()->internalRedirect('admin/blocklist/server');
+ DI::baseUrl()->redirect('admin/blocklist/server');
}
- public static function content()
+ public static function content(array $parameters = [])
{
- parent::content();
+ parent::content($parameters);
- $a = self::getApp();
-
- $blocklist = Config::get('system', 'blocklist');
+ $blocklist = DI::config()->get('system', 'blocklist');
$blocklistform = [];
if (is_array($blocklist)) {
foreach ($blocklist as $id => $b) {
$blocklistform[] = [
- 'domain' => ["domain[$id]", L10n::t('Blocked domain'), $b['domain'], '', L10n::t('The blocked domain'), 'required', '', ''],
- 'reason' => ["reason[$id]", L10n::t("Reason for the block"), $b['reason'], L10n::t('The reason why you blocked this domain.') . '(' . $b['domain'] . ')', 'required', '', ''],
- 'delete' => ["delete[$id]", L10n::t("Delete domain") . ' (' . $b['domain'] . ')', false, L10n::t("Check to delete this entry from the blocklist")]
+ 'domain' => ["domain[$id]", DI::l10n()->t('Blocked server domain pattern'), $b['domain'], '', DI::l10n()->t('Required'), '', ''],
+ 'reason' => ["reason[$id]", DI::l10n()->t("Reason for the block"), $b['reason'], '', DI::l10n()->t('Required'), '', ''],
+ 'delete' => ["delete[$id]", DI::l10n()->t("Delete server domain pattern") . ' (' . $b['domain'] . ')', false, DI::l10n()->t("Check to delete this entry from the blocklist")]
];
}
}
$t = Renderer::getMarkupTemplate('admin/blocklist/server.tpl');
return Renderer::replaceMacros($t, [
- '$title' => L10n::t('Administration'),
- '$page' => L10n::t('Server Blocklist'),
- '$intro' => L10n::t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'),
- '$public' => L10n::t('The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'),
- '$addtitle' => L10n::t('Add new entry to block list'),
- '$newdomain' => ['newentry_domain', L10n::t('Server Domain'), '', L10n::t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''],
- '$newreason' => ['newentry_reason', L10n::t('Block reason'), '', L10n::t('The reason why you blocked this domain.'), 'required', '', ''],
- '$submit' => L10n::t('Add Entry'),
- '$savechanges' => L10n::t('Save changes to the blocklist'),
- '$currenttitle' => L10n::t('Current Entries in the Blocklist'),
- '$thurl' => L10n::t('Blocked domain'),
- '$threason' => L10n::t('Reason for the block'),
- '$delentry' => L10n::t('Delete entry from blocklist'),
+ '$title' => DI::l10n()->t('Administration'),
+ '$page' => DI::l10n()->t('Server Domain Pattern Blocklist'),
+ '$intro' => DI::l10n()->t('This page can be used to define a blocklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'),
+ '$public' => DI::l10n()->t('The list of blocked server domain patterns will be made publically available on the <a href="/friendica">/friendica</a> page so that your users and people investigating communication problems can find the reason easily.'),
+ '$syntax' => DI::l10n()->t('<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>
+<ul>
+ <li><code>*</code>: Any number of characters</li>
+ <li><code>?</code>: Any single character</li>
+ <li><code>[<char1><char2>...]</code>: char1 or char2</li>
+</ul>'),
+ '$addtitle' => DI::l10n()->t('Add new entry to block list'),
+ '$newdomain' => ['newentry_domain', DI::l10n()->t('Server Domain Pattern'), '', DI::l10n()->t('The domain pattern of the new server to add to the block list. Do not include the protocol.'), DI::l10n()->t('Required'), '', ''],
+ '$newreason' => ['newentry_reason', DI::l10n()->t('Block reason'), '', DI::l10n()->t('The reason why you blocked this server domain pattern.'), DI::l10n()->t('Required'), '', ''],
+ '$submit' => DI::l10n()->t('Add Entry'),
+ '$savechanges' => DI::l10n()->t('Save changes to the blocklist'),
+ '$currenttitle' => DI::l10n()->t('Current Entries in the Blocklist'),
+ '$thurl' => DI::l10n()->t('Blocked server domain pattern'),
+ '$threason' => DI::l10n()->t('Reason for the block'),
+ '$delentry' => DI::l10n()->t('Delete entry from blocklist'),
'$entries' => $blocklistform,
- '$baseurl' => $a->getBaseURL(true),
- '$confirm_delete' => L10n::t('Delete entry from blocklist?'),
- '$form_security_token' => parent::getFormSecurityToken("admin_blocklist")
+ '$baseurl' => DI::baseUrl()->get(true),
+ '$confirm_delete' => DI::l10n()->t('Delete entry from blocklist?'),
+ '$form_security_token' => self::getFormSecurityToken("admin_blocklist")
]);
}
}
projects / friendica.git / blobdiff