nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some small stuff

Browse source
This commit is contained in:
Tobias Diekershoff 2020-08-08 08:35:34 +02:00
parent afb167602b
commit 1834f24c9f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Console/ServerBlock.php
View file

@ -127,10 +127,10 @@ HELP;
$filename = $this->getArgument(1); $filename = $this->getArgument(1);
$currBlockList = $config->get('system', 'blocklist', []); $currBlockList = $config->get('system', 'blocklist', []);
$newBlockList = []; $newBlockList = [];
if (($fp = fopen($filename, 'r')) !== FALSE) { if (($fp = fopen($filename, 'r')) !== false) {
while (($data = fgetcsv($fp, 1000, ',')) !== FALSE) { while (($data = fgetcsv($fp, 1000, ',')) !== false) {
$domain = $data[0]; $domain = $data[0];
if (count($data) == 0) { if (count($data) == 0) {
$reason = self::DEFAULT_REASON; $reason = self::DEFAULT_REASON;
} else { } else {
$reason = $data[1]; $reason = $data[1];
@ -139,12 +139,14 @@ HELP;
'domain' => $domain, 'domain' => $domain,
'reason' => $reason 'reason' => $reason
]; ];
if (!in_array($data, $newBlockList)) if (!in_array($data, $newBlockList)) {
$newBlockList[] = $data; $newBlockList[] = $data;
}
} }
foreach ($currBlockList as $blocked) { foreach ($currBlockList as $blocked) {
if (!in_array($blocked, $newBlockList)) if (!in_array($blocked, $newBlockList)) {
$newBlockList[] = $blocked; $newBlockList[] = $blocked;
}
} }
if ($config->set('system', 'blocklist', $newBlockList)) { if ($config->set('system', 'blocklist', $newBlockList)) {
$this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename)); $this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename));