namespace Friendica\Core\Console;
use Asika\SimpleConsole\CommandArgsException;
-use dba;
+use Friendica\App;
use Friendica\Core;
+use RuntimeException;
require_once 'include/dba.php';
require_once 'include/text.php';
throw new CommandArgsException('Too many arguments');
}
- if ($a->mode === \Friendica\App::MODE_INSTALL) {
+ if (!($a->mode & App::MODE_DBCONFIGAVAILABLE)) {
$this->out('Database isn\'t ready or populated yet, showing file config only');
}
if (count($this->args) == 3) {
- $result = Core\Config::set($this->getArgument(0), $this->getArgument(1), $this->getArgument(2));
+ $cat = $this->getArgument(0);
+ $key = $this->getArgument(1);
+ $value = $this->getArgument(2);
+
+ if (is_array(Core\Config::get($cat, $key))) {
+ throw new RuntimeException("$cat.$key is an array and can't be set using this command.");
+ }
+
+ $result = Core\Config::set($cat, $key, $value);
if ($result) {
- $this->out("{$this->getArgument(0)}.{$this->getArgument(1)} = " .
- Core\Config::get($this->getArgument(0), $this->getArgument(1)));
+ $this->out("{$cat}.{$key} <= " .
+ Core\Config::get($cat, $key));
} else {
- $this->out("Unable to set {$this->getArgument(0)}.{$this->getArgument(1)}");
+ $this->out("Unable to set {$cat}.{$key}");
}
}
if (count($this->args) == 2) {
- $this->out("{$this->getArgument(0)}.{$this->getArgument(1)} = " .
- Core\Config::get($this->getArgument(0), $this->getArgument(1)));
+ $cat = $this->getArgument(0);
+ $key = $this->getArgument(1);
+ $value = Core\Config::get($this->getArgument(0), $this->getArgument(1));
+
+ if (is_array($value)) {
+ foreach ($value as $k => $v) {
+ $this->out("{$cat}.{$key}[{$k}] => " . $v);
+ }
+ } else {
+ $this->out("{$cat}.{$key} => " . $value);
+ }
}
if (count($this->args) == 1) {
- Core\Config::load($this->getArgument(0));
-
- if (!is_null($a->config[$this->getArgument(0)])) {
- foreach ($a->config[$this->getArgument(0)] as $k => $x) {
- $this->out("{$this->getArgument(0)}.{$k} = " . $x);
+ $cat = $this->getArgument(0);
+ Core\Config::load($cat);
+
+ if (!is_null($a->config[$cat])) {
+ $this->out("[{$cat}]");
+ foreach ($a->config[$cat] as $key => $value) {
+ if (is_array($value)) {
+ foreach ($value as $k => $v) {
+ $this->out("{$key}[{$k}] => " . $v);
+ }
+ } else {
+ $this->out("{$key} => " . $value);
+ }
}
} else {
$this->out('Config section ' . $this->getArgument(0) . ' returned nothing');
if (count($this->args) == 0) {
Core\Config::load();
- if (Core\Config::get('system', 'config_adapter') != 'preload' && $a->mode !== \Friendica\App::MODE_INSTALL) {
+ if (Core\Config::get('system', 'config_adapter') == 'jit' && $a->mode & App::MODE_DBCONFIGAVAILABLE) {
$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
}
foreach ($section as $key => $value) {
if (is_array($value)) {
foreach ($value as $k => $v) {
- $this->out("{$cat}.{$key}[{$k}] = " . $v);
+ $this->out("{$cat}.{$key}[{$k}] => " . $v);
}
} else {
- $this->out("{$cat}.{$key} = " . $value);
+ $this->out("{$cat}.{$key} => " . $value);
}
}
} else {
- $this->out("config.{$cat} = " . $section);
+ $this->out("config.{$cat} => " . $section);
}
}
}