Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-31 21:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14414 from ne20002/fix/14407

Browse source 
fix upload of csv server blocklist
This commit is contained in:
Tobias Diekershoff 2024-09-04 08:30:35 +02:00 committed by GitHub
commit 9bf5b27362
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,23 +58,22 @@ class Import extends \Friendica\Module\BaseModeration
$this->blocklist = $this->localBlocklist::extractFromCSVFile($_FILES['listfile']['tmp_name']);
} catch (\Throwable $e) {
$this->systemMessages->addNotice($this->t('Error importing pattern file'));
}
return;
}
if (isset($request['page_blocklist_import'])) {
$blocklist = json_decode($request['blocklist'], true);
if ($blocklist === null) {
}
else if (isset($request['page_blocklist_import'])) {
$this->blocklist = json_decode($request['blocklist'], true);
if ($this->blocklist === null) {
$this->systemMessages->addNotice($this->t('Error importing pattern file'));
return;
}
}
if (($request['mode'] ?? 'append') == 'replace') {
$this->localBlocklist->set($blocklist);
$this->localBlocklist->set($this->blocklist);
$this->systemMessages->addNotice($this->t('Local blocklist replaced with the provided file.'));
} else {
$count = $this->localBlocklist->append($blocklist);
$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 {
@ -86,7 +85,6 @@ class Import extends \Friendica\Module\BaseModeration
$this->baseUrl->redirect('/moderation/blocklist/server');
}
}
/**
* @param array $request