Improve Console/Config display for array values

- Prevent setting a config key that is an array

diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index 860c9e891d5c830bd95f7aa20c7c223f7cd7ac7e..c37dd26b15ddb3cbbf81c5d80e07c1fae16b5f54 100644 (file)
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -97,26 +97,51 @@ HELP;
                }
 
                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');
@@ -126,7 +151,7 @@ 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->mode & \Friendica\App::MODE_DBCONFIGAVAILABLE) {
                                $this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
                        }