X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConsole%2FConfig.php;h=cf5c09fc0a4281bf5e6fe925d768f65e396a8f6c;hb=4375edd63e44b71913bd45bf25a4a554582b581e;hp=f619afade06423a4f498e3bc730bddb97be27498;hpb=cd9b864045588308e18e16f7a1c1029fd380d8fd;p=friendica.git diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php index f619afade0..cf5c09fc0a 100644 --- a/src/Core/Console/Config.php +++ b/src/Core/Console/Config.php @@ -1,19 +1,11 @@ + * @author Tobias Diekershoff + * @author Hypolite Petovan */ class Config extends \Asika\SimpleConsole\Console { @@ -67,7 +59,7 @@ Description Sets the value of the provided key in the category Notes: - Setting config entries which are manually set in config/local.ini.php may result in + Setting config entries which are manually set in config/local.config.php may result in conflict between database settings and the manual startup settings. Options @@ -79,7 +71,7 @@ HELP; protected function doExecute() { - $a = get_app(); + $a = \Friendica\BaseObject::getApp(); if ($this->getOption('v')) { $this->out('Executable: ' . $this->executable); @@ -92,31 +84,57 @@ HELP; throw new CommandArgsException('Too many arguments'); } - if (!($a->mode & \Friendica\App::MODE_DBCONFIGAVAILABLE)) { + if (!$a->getMode()->has(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}] => " . (is_array($v) ? implode(', ', $v) : $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 ($a->getConfigCache()->get($cat) !== null) { + $this->out("[{$cat}]"); + $catVal = $a->getConfigCache()->get($cat); + foreach ($catVal as $key => $value) { + if (is_array($value)) { + foreach ($value as $k => $v) { + $this->out("{$key}[{$k}] => " . (is_array($v) ? implode(', ', $v) : $v)); + } + } else { + $this->out("{$key} => " . $value); + } } } else { $this->out('Config section ' . $this->getArgument(0) . ' returned nothing'); @@ -126,23 +144,24 @@ HELP; if (count($this->args) == 0) { Core\Config::load(); - if (Core\Config::get('system', 'config_adapter') != 'preload' && $a->mode & \Friendica\App::MODE_DBCONFIGAVAILABLE) { + if (Core\Config::get('system', 'config_adapter') == 'jit' && $a->getMode()->has(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 ($a->config as $cat => $section) { + $config = $a->getConfigCache()->getAll(); + foreach ($config as $cat => $section) { if (is_array($section)) { 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}] => " . (is_array($v) ? implode(', ', $v) : $v)); } } else { - $this->out("{$cat}.{$key} = " . $value); + $this->out("{$cat}.{$key} => " . $value); } } } else { - $this->out("config.{$cat} = " . $section); + $this->out("config.{$cat} => " . $section); } } }