use Asika\SimpleConsole\CommandArgsException;
use Asika\SimpleConsole\Console;
use Console_Table;
-use Friendica\BaseObject;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Config\IConfiguration;
/**
- * @brief Manage blocked servers
+ * Manage blocked servers
*
* With this tool, you can list the current blocked servers
* or you can add / remove a blocked server from the list
protected $helpOptions = ['h', 'help', '?'];
+ /**
+ * @var IConfiguration
+ */
+ private $config;
+
protected function getHelp()
{
$help = <<<HELP
return $help;
}
- protected function doExecute()
+ public function __construct(IConfiguration $config, $argv = null)
{
- $a = BaseObject::getApp();
+ parent::__construct($argv);
+ $this->config = $config;
+ }
+
+ protected function doExecute()
+ {
if (count($this->args) == 0) {
- $this->printBlockedServers($a->getConfig());
+ $this->printBlockedServers($this->config);
return 0;
}
switch ($this->getArgument(0)) {
case 'add':
- return $this->addBlockedServer($a->getConfig());
+ return $this->addBlockedServer($this->config);
case 'remove':
- return $this->removeBlockedServer($a->getConfig());
+ return $this->removeBlockedServer($this->config);
default:
throw new CommandArgsException('Unknown command.');
break;
/**
* Prints the whole list of blocked domains including the reason
*
- * @param Configuration $config
+ * @param IConfiguration $config
*/
- private function printBlockedServers(Configuration $config)
+ private function printBlockedServers(IConfiguration $config)
{
$table = new Console_Table();
$table->setHeaders(['Domain', 'Reason']);
- $blocklist = $config->get('system', 'blocklist');
+ $blocklist = $config->get('system', 'blocklist', []);
foreach ($blocklist as $domain) {
$table->addRow($domain);
}
/**
* Adds a server to the blocked list
*
- * @param Configuration $config
+ * @param IConfiguration $config
*
* @return int The return code (0 = success, 1 = failed)
*/
- private function addBlockedServer(Configuration $config)
+ private function addBlockedServer(IConfiguration $config)
{
if (count($this->args) < 2 || count($this->args) > 3) {
throw new CommandArgsException('Add needs a domain and optional a reason.');
$update = false;
- $currBlocklist = $config->get('system', 'blocklist');
+ $currBlocklist = $config->get('system', 'blocklist', []);
$newBlockList = [];
foreach ($currBlocklist as $blocked) {
if ($blocked['domain'] === $domain) {
/**
* Removes a server from the blocked list
*
- * @param Configuration $config
+ * @param IConfiguration $config
*
* @return int The return code (0 = success, 1 = failed)
*/
- private function removeBlockedServer(Configuration $config)
+ private function removeBlockedServer(IConfiguration $config)
{
if (count($this->args) !== 2) {
throw new CommandArgsException('Remove needs a second parameter.');
$found = false;
- $currBlocklist = $config->get('system', 'blocklist');
+ $currBlocklist = $config->get('system', 'blocklist', []);
$newBlockList = [];
foreach ($currBlocklist as $blocked) {
if ($blocked['domain'] === $domain) {