Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-01-03 14:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes #14407

Browse source
This commit is contained in:
ne20002 2024-09-03 16:36:22 +00:00
parent 30f0a0673f
commit 2ea54e7031
No known key found for this signature in database
GPG key ID: 429E95F6E49B54C8
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/Module/Moderation/Blocklist/Server/Import.php
View file

@ -58,34 +58,32 @@ class Import extends \Friendica\Module\BaseModeration
$this->blocklist = $this->localBlocklist::extractFromCSVFile($_FILES['listfile']['tmp_name']); $this->blocklist = $this->localBlocklist::extractFromCSVFile($_FILES['listfile']['tmp_name']);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$this->systemMessages->addNotice($this->t('Error importing pattern file')); $this->systemMessages->addNotice($this->t('Error importing pattern file'));
return;
} }
return;
} }
else if (isset($request['page_blocklist_import'])) {
if (isset($request['page_blocklist_import'])) { $this->blocklist = json_decode($request['blocklist'], true);
$blocklist = json_decode($request['blocklist'], true); if ($this->blocklist === null) {
if ($blocklist === null) {
$this->systemMessages->addNotice($this->t('Error importing pattern file')); $this->systemMessages->addNotice($this->t('Error importing pattern file'));
return; return;
} }
if (($request['mode'] ?? 'append') == 'replace') {
$this->localBlocklist->set($blocklist);
$this->systemMessages->addNotice($this->t('Local blocklist replaced with the provided file.'));
} else {
$count = $this->localBlocklist->append($blocklist);
if ($count) {
$this->systemMessages->addNotice($this->tt('%d pattern was added to the local blocklist.', '%d patterns were added to the local blocklist.', $count));
} else {
$this->systemMessages->addNotice($this->t('No pattern was added to the local blocklist.'));
}
}
Worker::add(Worker::PRIORITY_LOW, 'UpdateBlockedServers');
$this->baseUrl->redirect('/moderation/blocklist/server');
} }
if (($request['mode'] ?? 'append') == 'replace') {
$this->localBlocklist->set($this->blocklist);
$this->systemMessages->addNotice($this->t('Local blocklist replaced with the provided file.'));
} else {
$count = $this->localBlocklist->append($this->blocklist);
if ($count) {
$this->systemMessages->addNotice($this->tt('%d pattern was added to the local blocklist.', '%d patterns were added to the local blocklist.', $count));
} else {
$this->systemMessages->addNotice($this->t('No pattern was added to the local blocklist.'));
}
}
Worker::add(Worker::PRIORITY_LOW, 'UpdateBlockedServers');
$this->baseUrl->redirect('/moderation/blocklist/server');
} }
/** /**