diff --git a/core/command/app/listapps.php b/core/command/app/listapps.php index 37a1d645ed..e30baddb74 100644 --- a/core/command/app/listapps.php +++ b/core/command/app/listapps.php @@ -55,12 +55,12 @@ class ListApps extends Base { sort($enabledApps); foreach ($enabledApps as $app) { - $apps['enabled'][$app] = (isset($versions[$app])) ? $versions[$app] : ''; + $apps['enabled'][$app] = (isset($versions[$app])) ? $versions[$app] : true; } sort($disabledApps); foreach ($disabledApps as $app) { - $apps['disabled'][$app] = (isset($versions[$app])) ? $versions[$app] : ''; + $apps['disabled'][$app] = null; } $this->writeAppList($input, $output, $apps); diff --git a/core/command/base.php b/core/command/base.php index c2d5cf97f0..f84dcb1aea 100644 --- a/core/command/base.php +++ b/core/command/base.php @@ -54,9 +54,30 @@ class Base extends Command { break; default: foreach ($items as $key => $item) { - $output->writeln(' - ' . (!is_int($key) ? $key . ': ' : '') . $item); + if (!is_int($key)) { + $value = $this->valueToString($item); + if (!is_null($value)) { + $output->writeln(' - ' . $key . ': ' . $value); + } else { + $output->writeln(' - ' . $key); + } + } else { + $output->writeln(' - ' . $this->valueToString($item)); + } } break; } } + + protected function valueToString($value) { + if ($value === false) { + return 'false'; + } else if ($value === true) { + return 'true'; + } else if ($value === null) { + null; + } else { + return $value; + } + } } diff --git a/core/command/status.php b/core/command/status.php index 3859f69feb..737113d4f8 100644 --- a/core/command/status.php +++ b/core/command/status.php @@ -37,7 +37,7 @@ class Status extends Base { protected function execute(InputInterface $input, OutputInterface $output) { $values = array( - 'installed' => \OC_Config::getValue('installed') ? 'true' : 'false', + 'installed' => (bool) \OC_Config::getValue('installed'), 'version' => implode('.', \OC_Util::getVersion()), 'versionstring' => \OC_Util::getVersionString(), 'edition' => \OC_Util::getEditionString(),