Merge pull request #9893 from MrPetovan/bug/9879-empty-plurals

[friendica.git] / src / Console / ServerBlock.php

diff --git a/src/Console/ServerBlock.php b/src/Console/ServerBlock.php
index 18ea65d6d053bfad02418cf5d14483cc3daec2ad..4d8c930c58963754efa92d91519ee10cad0fc5a5 100644 (file)
--- a/src/Console/ServerBlock.php
+++ b/src/Console/ServerBlock.php
@@ -112,6 +112,9 @@ HELP;
                $filename = $this->getArgument(1);
                $blocklist = $config->get('system', 'blocklist', []);
                $fp = fopen($filename, 'w');
+               if (!$fp) {
+                       throw new Exception(sprintf('The file "%s" could not be created.', $filename));
+               }
                foreach ($blocklist as $domain) {
                        fputcsv($fp, $domain);
                }
@@ -127,10 +130,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 +142,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));
@@ -154,13 +159,15 @@ HELP;
                                return 1;
                        }
 
+               } else {
+                       throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename));
                }
        }
 
        /**
         * Prints the whole list of blocked domains including the reason
         *
-        /* @param IConfig $config
+        * @param IConfig $config
         */
        private function printBlockedServers(IConfig $config)
        {