X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConsole%2FConfig.php;h=d67f6cbb966dc42416fb1b31581b173ce64e9204;hb=30ad6d60fd65ff2520baa7b0e4d18b77cf44096c;hp=fa7410af23ea4ab542a25f9ec678115378a45c66;hpb=346697d771e2656b4bcd12a5e84045710e9b2b55;p=friendica.git

diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index fa7410af23..d67f6cbb96 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
 {
@@ -67,7 +59,7 @@ Description
 		Sets the value of the provided key in the category
 
 Notes:
-	Setting config entries which are manually set in .htconfig.php may result in
+	Setting config entries which are manually set in config/local.ini.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,32 +84,56 @@ HELP;
 			throw new CommandArgsException('Too many arguments');
 		}
 
-		require_once 'config/.htconfig.php';
-		$result = dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+			$this->out('Database isn\'t ready or populated yet, showing file config only');
 		}
 
 		if (count($this->args) == 3) {
-			Core\Config::set($this->getArgument(0), $this->getArgument(1), $this->getArgument(2));
-			$this->out("config[{$this->getArgument(0)}][{$this->getArgument(1)}] = " . Core\Config::get($this->getArgument(0),
-					$this->getArgument(1)));
+			$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("{$cat}.{$key} <= " .
+					Core\Config::get($cat, $key));
+			} else {
+				$this->out("Unable to set {$cat}.{$key}");
+			}
 		}
 
 		if (count($this->args) == 2) {
-			$this->out("config[{$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));
-
-			$a = get_app();
-			if (!is_null($a->config[$this->getArgument(0)])) {
-				foreach ($a->config[$this->getArgument(0)] as $k => $x) {
-					$this->out("config[{$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');
@@ -125,13 +141,29 @@ HELP;
 		}
 
 		if (count($this->args) == 0) {
-			$configs = dba::select('config');
-			foreach ($configs as $config) {
-				$this->out("config[{$config['cat']}][{$config['k']}] = " . $config['v']);
+			Core\Config::load();
+
+			if (Core\Config::get('system', 'config_adapter') == 'jit' && App\Mode::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) {
+				if (is_array($section)) {
+					foreach ($section as $key => $value) {
+						if (is_array($value)) {
+							foreach ($value as $k => $v) {
+								$this->out("{$cat}.{$key}[{$k}] => " . $v);
+							}
+						} else {
+							$this->out("{$cat}.{$key} => " . $value);
+						}
+					}
+				} else {
+					$this->out("config.{$cat} => " . $section);
+				}
 			}
 		}
 
 		return 0;
 	}
-
 }