X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConsole%2FConfig.php;h=db436b8394e1ca2a533ab651997dab06a64d8706;hb=9fbaaa1481a609563e00a40db64bdce5e02c5524;hp=a6083ddb9fd40e87b62c215cc9069af9277830b5;hpb=e7c3d453c2695dab046767d78fcf29570aa77aff;p=friendica.git

diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index a6083ddb9f..db436b8394 100644
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -1,19 +1,11 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 namespace Friendica\Core\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use dba;
+use Friendica\App;
 use Friendica\Core;
-
-require_once 'include/dba.php';
-require_once 'include/text.php';
+use RuntimeException;
 
 /**
  * @brief tool to access the system config from the CLI
@@ -36,8 +28,8 @@ require_once 'include/text.php';
  *   set to the value of the last parameter. (e.g. "system loglevel 0" will
  *   disable logging)
  *
- * @author Tobias Diekershoff
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Config extends \Asika\SimpleConsole\Console
 {
@@ -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,56 @@ HELP;
 			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');
@@ -126,7 +143,7 @@ HELP;
 		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');
 			}
 
@@ -135,14 +152,14 @@ HELP;
 					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);
 				}
 			}
 		}