bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

All these methods need to return an integer (0=Success) or otherwise doExecute()

Browse source 
will return NULL.
This commit is contained in:
Roland Häder 2022-07-16 07:43:29 +02:00
parent 3546d0aabe
commit ce7af4edb8
Signed by: roland
GPG key ID: C82EDE5DDFA0BA77
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Console/ServerBlock.php
View file

@ -118,6 +118,9 @@ HELP;
foreach ($blocklist as $domain) { foreach ($blocklist as $domain) {
fputcsv($fp, $domain); fputcsv($fp, $domain);
} }
// Success
return 0;
} }
/** /**
* Imports a list of domains and a reason for the block from a CSV * Imports a list of domains and a reason for the block from a CSV
@ -130,6 +133,7 @@ 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];
@ -146,11 +150,13 @@ HELP;
$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));
return 0; return 0;
@ -158,7 +164,6 @@ HELP;
$this->out(sprintf("Couldn't save '%s' as blocked server", $domain)); $this->out(sprintf("Couldn't save '%s' as blocked server", $domain));
return 1; return 1;
} }
} else { } else {
throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename)); throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename));
} }
@ -178,6 +183,9 @@ HELP;
$table->addRow($domain); $table->addRow($domain);
} }
$this->out($table->getTable()); $this->out($table->getTable());
// Success
return 0;
} }
/** /**