From 1834f24c9fb5f91d6978f7f1788f98a058c37ca4 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 8 Aug 2020 08:35:34 +0200 Subject: [PATCH] some small stuff --- src/Console/ServerBlock.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Console/ServerBlock.php b/src/Console/ServerBlock.php index 18ea65d6d..40d8e45e7 100644 --- a/src/Console/ServerBlock.php +++ b/src/Console/ServerBlock.php @@ -127,10 +127,10 @@ HELP; $filename = $this->getArgument(1); $currBlockList = $config->get('system', 'blocklist', []); $newBlockList = []; - if (($fp = fopen($filename, 'r')) !== FALSE) { - while (($data = fgetcsv($fp, 1000, ',')) !== FALSE) { + if (($fp = fopen($filename, 'r')) !== false) { + while (($data = fgetcsv($fp, 1000, ',')) !== false) { $domain = $data[0]; - if (count($data) == 0) { + if (count($data) == 0) { $reason = self::DEFAULT_REASON; } else { $reason = $data[1]; @@ -139,12 +139,14 @@ HELP; 'domain' => $domain, 'reason' => $reason ]; - if (!in_array($data, $newBlockList)) + if (!in_array($data, $newBlockList)) { $newBlockList[] = $data; + } } foreach ($currBlockList as $blocked) { - if (!in_array($blocked, $newBlockList)) + if (!in_array($blocked, $newBlockList)) { $newBlockList[] = $blocked; + } } if ($config->set('system', 'blocklist', $newBlockList)) { $this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename));