@@ -32,56 +32,56 @@ |
||
32 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 33 | |
34 | 34 | class Report extends Command { |
35 | - /** @var IUserManager */ |
|
36 | - protected $userManager; |
|
35 | + /** @var IUserManager */ |
|
36 | + protected $userManager; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param IUserManager $userManager |
|
40 | - */ |
|
41 | - public function __construct(IUserManager $userManager) { |
|
42 | - $this->userManager = $userManager; |
|
43 | - parent::__construct(); |
|
44 | - } |
|
38 | + /** |
|
39 | + * @param IUserManager $userManager |
|
40 | + */ |
|
41 | + public function __construct(IUserManager $userManager) { |
|
42 | + $this->userManager = $userManager; |
|
43 | + parent::__construct(); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function configure() { |
|
47 | - $this |
|
48 | - ->setName('user:report') |
|
49 | - ->setDescription('shows how many users have access'); |
|
50 | - } |
|
46 | + protected function configure() { |
|
47 | + $this |
|
48 | + ->setName('user:report') |
|
49 | + ->setDescription('shows how many users have access'); |
|
50 | + } |
|
51 | 51 | |
52 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
53 | - $table = new Table($output); |
|
54 | - $table->setHeaders(array('User Report', '')); |
|
55 | - $userCountArray = $this->countUsers(); |
|
56 | - if(!empty($userCountArray)) { |
|
57 | - $total = 0; |
|
58 | - $rows = array(); |
|
59 | - foreach($userCountArray as $classname => $users) { |
|
60 | - $total += $users; |
|
61 | - $rows[] = array($classname, $users); |
|
62 | - } |
|
52 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
53 | + $table = new Table($output); |
|
54 | + $table->setHeaders(array('User Report', '')); |
|
55 | + $userCountArray = $this->countUsers(); |
|
56 | + if(!empty($userCountArray)) { |
|
57 | + $total = 0; |
|
58 | + $rows = array(); |
|
59 | + foreach($userCountArray as $classname => $users) { |
|
60 | + $total += $users; |
|
61 | + $rows[] = array($classname, $users); |
|
62 | + } |
|
63 | 63 | |
64 | - $rows[] = array(' '); |
|
65 | - $rows[] = array('total users', $total); |
|
66 | - } else { |
|
67 | - $rows[] = array('No backend enabled that supports user counting', ''); |
|
68 | - } |
|
64 | + $rows[] = array(' '); |
|
65 | + $rows[] = array('total users', $total); |
|
66 | + } else { |
|
67 | + $rows[] = array('No backend enabled that supports user counting', ''); |
|
68 | + } |
|
69 | 69 | |
70 | - $userDirectoryCount = $this->countUserDirectories(); |
|
71 | - $rows[] = array(' '); |
|
72 | - $rows[] = array('user directories', $userDirectoryCount); |
|
70 | + $userDirectoryCount = $this->countUserDirectories(); |
|
71 | + $rows[] = array(' '); |
|
72 | + $rows[] = array('user directories', $userDirectoryCount); |
|
73 | 73 | |
74 | - $table->setRows($rows); |
|
75 | - $table->render(); |
|
76 | - } |
|
74 | + $table->setRows($rows); |
|
75 | + $table->render(); |
|
76 | + } |
|
77 | 77 | |
78 | - private function countUsers() { |
|
79 | - return $this->userManager->countUsers(); |
|
80 | - } |
|
78 | + private function countUsers() { |
|
79 | + return $this->userManager->countUsers(); |
|
80 | + } |
|
81 | 81 | |
82 | - private function countUserDirectories() { |
|
83 | - $dataview = new \OC\Files\View('/'); |
|
84 | - $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory'); |
|
85 | - return count($userDirectories); |
|
86 | - } |
|
82 | + private function countUserDirectories() { |
|
83 | + $dataview = new \OC\Files\View('/'); |
|
84 | + $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory'); |
|
85 | + return count($userDirectories); |
|
86 | + } |
|
87 | 87 | } |
@@ -53,10 +53,10 @@ |
||
53 | 53 | $table = new Table($output); |
54 | 54 | $table->setHeaders(array('User Report', '')); |
55 | 55 | $userCountArray = $this->countUsers(); |
56 | - if(!empty($userCountArray)) { |
|
56 | + if (!empty($userCountArray)) { |
|
57 | 57 | $total = 0; |
58 | 58 | $rows = array(); |
59 | - foreach($userCountArray as $classname => $users) { |
|
59 | + foreach ($userCountArray as $classname => $users) { |
|
60 | 60 | $total += $users; |
61 | 61 | $rows[] = array($classname, $users); |
62 | 62 | } |
@@ -32,40 +32,40 @@ |
||
32 | 32 | use Symfony\Component\Console\Input\InputArgument; |
33 | 33 | |
34 | 34 | class Delete extends Command { |
35 | - /** @var IUserManager */ |
|
36 | - protected $userManager; |
|
35 | + /** @var IUserManager */ |
|
36 | + protected $userManager; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param IUserManager $userManager |
|
40 | - */ |
|
41 | - public function __construct(IUserManager $userManager) { |
|
42 | - $this->userManager = $userManager; |
|
43 | - parent::__construct(); |
|
44 | - } |
|
38 | + /** |
|
39 | + * @param IUserManager $userManager |
|
40 | + */ |
|
41 | + public function __construct(IUserManager $userManager) { |
|
42 | + $this->userManager = $userManager; |
|
43 | + parent::__construct(); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function configure() { |
|
47 | - $this |
|
48 | - ->setName('user:delete') |
|
49 | - ->setDescription('deletes the specified user') |
|
50 | - ->addArgument( |
|
51 | - 'uid', |
|
52 | - InputArgument::REQUIRED, |
|
53 | - 'the username' |
|
54 | - ); |
|
55 | - } |
|
46 | + protected function configure() { |
|
47 | + $this |
|
48 | + ->setName('user:delete') |
|
49 | + ->setDescription('deletes the specified user') |
|
50 | + ->addArgument( |
|
51 | + 'uid', |
|
52 | + InputArgument::REQUIRED, |
|
53 | + 'the username' |
|
54 | + ); |
|
55 | + } |
|
56 | 56 | |
57 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
58 | - $user = $this->userManager->get($input->getArgument('uid')); |
|
59 | - if (is_null($user)) { |
|
60 | - $output->writeln('<error>User does not exist</error>'); |
|
61 | - return; |
|
62 | - } |
|
57 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
58 | + $user = $this->userManager->get($input->getArgument('uid')); |
|
59 | + if (is_null($user)) { |
|
60 | + $output->writeln('<error>User does not exist</error>'); |
|
61 | + return; |
|
62 | + } |
|
63 | 63 | |
64 | - if ($user->delete()) { |
|
65 | - $output->writeln('<info>The specified user was deleted</info>'); |
|
66 | - return; |
|
67 | - } |
|
64 | + if ($user->delete()) { |
|
65 | + $output->writeln('<info>The specified user was deleted</info>'); |
|
66 | + return; |
|
67 | + } |
|
68 | 68 | |
69 | - $output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>'); |
|
70 | - } |
|
69 | + $output->writeln('<error>The specified user could not be deleted. Please check the logs.</error>'); |
|
70 | + } |
|
71 | 71 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | class WebCron extends Base { |
29 | 29 | |
30 | - protected function getMode() { |
|
31 | - return 'webcron'; |
|
32 | - } |
|
30 | + protected function getMode() { |
|
31 | + return 'webcron'; |
|
32 | + } |
|
33 | 33 | } |
@@ -39,39 +39,39 @@ |
||
39 | 39 | abstract class Base extends Command { |
40 | 40 | |
41 | 41 | |
42 | - abstract protected function getMode(); |
|
42 | + abstract protected function getMode(); |
|
43 | 43 | |
44 | - /** |
|
45 | - * @var \OCP\IConfig |
|
46 | - */ |
|
47 | - protected $config; |
|
44 | + /** |
|
45 | + * @var \OCP\IConfig |
|
46 | + */ |
|
47 | + protected $config; |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param \OCP\IConfig $config |
|
51 | - */ |
|
52 | - public function __construct(IConfig $config) { |
|
53 | - $this->config = $config; |
|
54 | - parent::__construct(); |
|
55 | - } |
|
49 | + /** |
|
50 | + * @param \OCP\IConfig $config |
|
51 | + */ |
|
52 | + public function __construct(IConfig $config) { |
|
53 | + $this->config = $config; |
|
54 | + parent::__construct(); |
|
55 | + } |
|
56 | 56 | |
57 | - protected function configure() { |
|
58 | - $mode = $this->getMode(); |
|
59 | - $this |
|
60 | - ->setName("background:$mode") |
|
61 | - ->setDescription("Use $mode to run background jobs"); |
|
62 | - } |
|
57 | + protected function configure() { |
|
58 | + $mode = $this->getMode(); |
|
59 | + $this |
|
60 | + ->setName("background:$mode") |
|
61 | + ->setDescription("Use $mode to run background jobs"); |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Executing this command will set the background job mode for owncloud. |
|
66 | - * The mode to set is specified by the concrete sub class by implementing the |
|
67 | - * getMode() function. |
|
68 | - * |
|
69 | - * @param InputInterface $input |
|
70 | - * @param OutputInterface $output |
|
71 | - */ |
|
72 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
73 | - $mode = $this->getMode(); |
|
74 | - $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); |
|
75 | - $output->writeln("Set mode for background jobs to '$mode'"); |
|
76 | - } |
|
64 | + /** |
|
65 | + * Executing this command will set the background job mode for owncloud. |
|
66 | + * The mode to set is specified by the concrete sub class by implementing the |
|
67 | + * getMode() function. |
|
68 | + * |
|
69 | + * @param InputInterface $input |
|
70 | + * @param OutputInterface $output |
|
71 | + */ |
|
72 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
73 | + $mode = $this->getMode(); |
|
74 | + $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); |
|
75 | + $output->writeln("Set mode for background jobs to '$mode'"); |
|
76 | + } |
|
77 | 77 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | */ |
72 | 72 | protected function execute(InputInterface $input, OutputInterface $output) { |
73 | 73 | $mode = $this->getMode(); |
74 | - $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); |
|
74 | + $this->config->setAppValue('core', 'backgroundjobs_mode', $mode); |
|
75 | 75 | $output->writeln("Set mode for background jobs to '$mode'"); |
76 | 76 | } |
77 | 77 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | class Cron extends Base { |
29 | 29 | |
30 | - protected function getMode() { |
|
31 | - return 'cron'; |
|
32 | - } |
|
30 | + protected function getMode() { |
|
31 | + return 'cron'; |
|
32 | + } |
|
33 | 33 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | class Ajax extends Base { |
29 | 29 | |
30 | - protected function getMode() { |
|
31 | - return 'ajax'; |
|
32 | - } |
|
30 | + protected function getMode() { |
|
31 | + return 'ajax'; |
|
32 | + } |
|
33 | 33 | } |
@@ -32,127 +32,127 @@ |
||
32 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 33 | |
34 | 34 | class ListConfigs extends Base { |
35 | - protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY; |
|
36 | - |
|
37 | - /** * @var SystemConfig */ |
|
38 | - protected $systemConfig; |
|
39 | - |
|
40 | - /** @var IAppConfig */ |
|
41 | - protected $appConfig; |
|
42 | - |
|
43 | - /** |
|
44 | - * @param SystemConfig $systemConfig |
|
45 | - * @param IAppConfig $appConfig |
|
46 | - */ |
|
47 | - public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) { |
|
48 | - parent::__construct(); |
|
49 | - $this->systemConfig = $systemConfig; |
|
50 | - $this->appConfig = $appConfig; |
|
51 | - } |
|
52 | - |
|
53 | - protected function configure() { |
|
54 | - parent::configure(); |
|
55 | - |
|
56 | - $this |
|
57 | - ->setName('config:list') |
|
58 | - ->setDescription('List all configs') |
|
59 | - ->addArgument( |
|
60 | - 'app', |
|
61 | - InputArgument::OPTIONAL, |
|
62 | - 'Name of the app ("system" to get the config.php values, "all" for all apps and system)', |
|
63 | - 'all' |
|
64 | - ) |
|
65 | - ->addOption( |
|
66 | - 'private', |
|
67 | - null, |
|
68 | - InputOption::VALUE_NONE, |
|
69 | - 'Use this option when you want to include sensitive configs like passwords, salts, ...' |
|
70 | - ) |
|
71 | - ; |
|
72 | - } |
|
73 | - |
|
74 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
75 | - $app = $input->getArgument('app'); |
|
76 | - $noSensitiveValues = !$input->getOption('private'); |
|
77 | - |
|
78 | - switch ($app) { |
|
79 | - case 'system': |
|
80 | - $configs = [ |
|
81 | - 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
82 | - ]; |
|
83 | - break; |
|
84 | - |
|
85 | - case 'all': |
|
86 | - $apps = $this->appConfig->getApps(); |
|
87 | - $configs = [ |
|
88 | - 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
89 | - 'apps' => [], |
|
90 | - ]; |
|
91 | - foreach ($apps as $appName) { |
|
92 | - $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues); |
|
93 | - } |
|
94 | - break; |
|
95 | - |
|
96 | - default: |
|
97 | - $configs = [ |
|
98 | - 'apps' => [ |
|
99 | - $app => $this->getAppConfigs($app, $noSensitiveValues), |
|
100 | - ], |
|
101 | - ]; |
|
102 | - } |
|
103 | - |
|
104 | - $this->writeArrayInOutputFormat($input, $output, $configs); |
|
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * Get the system configs |
|
109 | - * |
|
110 | - * @param bool $noSensitiveValues |
|
111 | - * @return array |
|
112 | - */ |
|
113 | - protected function getSystemConfigs($noSensitiveValues) { |
|
114 | - $keys = $this->systemConfig->getKeys(); |
|
115 | - |
|
116 | - $configs = []; |
|
117 | - foreach ($keys as $key) { |
|
118 | - if ($noSensitiveValues) { |
|
119 | - $value = $this->systemConfig->getFilteredValue($key, serialize(null)); |
|
120 | - } else { |
|
121 | - $value = $this->systemConfig->getValue($key, serialize(null)); |
|
122 | - } |
|
123 | - |
|
124 | - if ($value !== 'N;') { |
|
125 | - $configs[$key] = $value; |
|
126 | - } |
|
127 | - } |
|
128 | - |
|
129 | - return $configs; |
|
130 | - } |
|
131 | - |
|
132 | - /** |
|
133 | - * Get the app configs |
|
134 | - * |
|
135 | - * @param string $app |
|
136 | - * @param bool $noSensitiveValues |
|
137 | - * @return array |
|
138 | - */ |
|
139 | - protected function getAppConfigs($app, $noSensitiveValues) { |
|
140 | - if ($noSensitiveValues) { |
|
141 | - return $this->appConfig->getFilteredValues($app, false); |
|
142 | - } else { |
|
143 | - return $this->appConfig->getValues($app, false); |
|
144 | - } |
|
145 | - } |
|
146 | - |
|
147 | - /** |
|
148 | - * @param string $argumentName |
|
149 | - * @param CompletionContext $context |
|
150 | - * @return string[] |
|
151 | - */ |
|
152 | - public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
153 | - if ($argumentName === 'app') { |
|
154 | - return array_merge(['all', 'system'], \OC_App::getAllApps()); |
|
155 | - } |
|
156 | - return []; |
|
157 | - } |
|
35 | + protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY; |
|
36 | + |
|
37 | + /** * @var SystemConfig */ |
|
38 | + protected $systemConfig; |
|
39 | + |
|
40 | + /** @var IAppConfig */ |
|
41 | + protected $appConfig; |
|
42 | + |
|
43 | + /** |
|
44 | + * @param SystemConfig $systemConfig |
|
45 | + * @param IAppConfig $appConfig |
|
46 | + */ |
|
47 | + public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) { |
|
48 | + parent::__construct(); |
|
49 | + $this->systemConfig = $systemConfig; |
|
50 | + $this->appConfig = $appConfig; |
|
51 | + } |
|
52 | + |
|
53 | + protected function configure() { |
|
54 | + parent::configure(); |
|
55 | + |
|
56 | + $this |
|
57 | + ->setName('config:list') |
|
58 | + ->setDescription('List all configs') |
|
59 | + ->addArgument( |
|
60 | + 'app', |
|
61 | + InputArgument::OPTIONAL, |
|
62 | + 'Name of the app ("system" to get the config.php values, "all" for all apps and system)', |
|
63 | + 'all' |
|
64 | + ) |
|
65 | + ->addOption( |
|
66 | + 'private', |
|
67 | + null, |
|
68 | + InputOption::VALUE_NONE, |
|
69 | + 'Use this option when you want to include sensitive configs like passwords, salts, ...' |
|
70 | + ) |
|
71 | + ; |
|
72 | + } |
|
73 | + |
|
74 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
75 | + $app = $input->getArgument('app'); |
|
76 | + $noSensitiveValues = !$input->getOption('private'); |
|
77 | + |
|
78 | + switch ($app) { |
|
79 | + case 'system': |
|
80 | + $configs = [ |
|
81 | + 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
82 | + ]; |
|
83 | + break; |
|
84 | + |
|
85 | + case 'all': |
|
86 | + $apps = $this->appConfig->getApps(); |
|
87 | + $configs = [ |
|
88 | + 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
89 | + 'apps' => [], |
|
90 | + ]; |
|
91 | + foreach ($apps as $appName) { |
|
92 | + $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues); |
|
93 | + } |
|
94 | + break; |
|
95 | + |
|
96 | + default: |
|
97 | + $configs = [ |
|
98 | + 'apps' => [ |
|
99 | + $app => $this->getAppConfigs($app, $noSensitiveValues), |
|
100 | + ], |
|
101 | + ]; |
|
102 | + } |
|
103 | + |
|
104 | + $this->writeArrayInOutputFormat($input, $output, $configs); |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * Get the system configs |
|
109 | + * |
|
110 | + * @param bool $noSensitiveValues |
|
111 | + * @return array |
|
112 | + */ |
|
113 | + protected function getSystemConfigs($noSensitiveValues) { |
|
114 | + $keys = $this->systemConfig->getKeys(); |
|
115 | + |
|
116 | + $configs = []; |
|
117 | + foreach ($keys as $key) { |
|
118 | + if ($noSensitiveValues) { |
|
119 | + $value = $this->systemConfig->getFilteredValue($key, serialize(null)); |
|
120 | + } else { |
|
121 | + $value = $this->systemConfig->getValue($key, serialize(null)); |
|
122 | + } |
|
123 | + |
|
124 | + if ($value !== 'N;') { |
|
125 | + $configs[$key] = $value; |
|
126 | + } |
|
127 | + } |
|
128 | + |
|
129 | + return $configs; |
|
130 | + } |
|
131 | + |
|
132 | + /** |
|
133 | + * Get the app configs |
|
134 | + * |
|
135 | + * @param string $app |
|
136 | + * @param bool $noSensitiveValues |
|
137 | + * @return array |
|
138 | + */ |
|
139 | + protected function getAppConfigs($app, $noSensitiveValues) { |
|
140 | + if ($noSensitiveValues) { |
|
141 | + return $this->appConfig->getFilteredValues($app, false); |
|
142 | + } else { |
|
143 | + return $this->appConfig->getValues($app, false); |
|
144 | + } |
|
145 | + } |
|
146 | + |
|
147 | + /** |
|
148 | + * @param string $argumentName |
|
149 | + * @param CompletionContext $context |
|
150 | + * @return string[] |
|
151 | + */ |
|
152 | + public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
153 | + if ($argumentName === 'app') { |
|
154 | + return array_merge(['all', 'system'], \OC_App::getAllApps()); |
|
155 | + } |
|
156 | + return []; |
|
157 | + } |
|
158 | 158 | } |
@@ -74,8 +74,7 @@ |
||
74 | 74 | |
75 | 75 | try { |
76 | 76 | $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists')); |
77 | - } |
|
78 | - catch (\UnexpectedValueException $e) { |
|
77 | + } catch (\UnexpectedValueException $e) { |
|
79 | 78 | $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
80 | 79 | return 1; |
81 | 80 | } |
@@ -29,89 +29,89 @@ |
||
29 | 29 | use Symfony\Component\Console\Output\OutputInterface; |
30 | 30 | |
31 | 31 | class DeleteConfig extends Base { |
32 | - /** * @var SystemConfig */ |
|
33 | - protected $systemConfig; |
|
32 | + /** * @var SystemConfig */ |
|
33 | + protected $systemConfig; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param SystemConfig $systemConfig |
|
37 | - */ |
|
38 | - public function __construct(SystemConfig $systemConfig) { |
|
39 | - parent::__construct(); |
|
40 | - $this->systemConfig = $systemConfig; |
|
41 | - } |
|
35 | + /** |
|
36 | + * @param SystemConfig $systemConfig |
|
37 | + */ |
|
38 | + public function __construct(SystemConfig $systemConfig) { |
|
39 | + parent::__construct(); |
|
40 | + $this->systemConfig = $systemConfig; |
|
41 | + } |
|
42 | 42 | |
43 | - protected function configure() { |
|
44 | - parent::configure(); |
|
43 | + protected function configure() { |
|
44 | + parent::configure(); |
|
45 | 45 | |
46 | - $this |
|
47 | - ->setName('config:system:delete') |
|
48 | - ->setDescription('Delete a system config value') |
|
49 | - ->addArgument( |
|
50 | - 'name', |
|
51 | - InputArgument::REQUIRED | InputArgument::IS_ARRAY, |
|
52 | - 'Name of the config to delete, specify multiple for array parameter' |
|
53 | - ) |
|
54 | - ->addOption( |
|
55 | - 'error-if-not-exists', |
|
56 | - null, |
|
57 | - InputOption::VALUE_NONE, |
|
58 | - 'Checks whether the config exists before deleting it' |
|
59 | - ) |
|
60 | - ; |
|
61 | - } |
|
46 | + $this |
|
47 | + ->setName('config:system:delete') |
|
48 | + ->setDescription('Delete a system config value') |
|
49 | + ->addArgument( |
|
50 | + 'name', |
|
51 | + InputArgument::REQUIRED | InputArgument::IS_ARRAY, |
|
52 | + 'Name of the config to delete, specify multiple for array parameter' |
|
53 | + ) |
|
54 | + ->addOption( |
|
55 | + 'error-if-not-exists', |
|
56 | + null, |
|
57 | + InputOption::VALUE_NONE, |
|
58 | + 'Checks whether the config exists before deleting it' |
|
59 | + ) |
|
60 | + ; |
|
61 | + } |
|
62 | 62 | |
63 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
64 | - $configNames = $input->getArgument('name'); |
|
65 | - $configName = $configNames[0]; |
|
63 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
64 | + $configNames = $input->getArgument('name'); |
|
65 | + $configName = $configNames[0]; |
|
66 | 66 | |
67 | - if (count($configNames) > 1) { |
|
68 | - if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { |
|
69 | - $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
|
70 | - return 1; |
|
71 | - } |
|
67 | + if (count($configNames) > 1) { |
|
68 | + if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { |
|
69 | + $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
|
70 | + return 1; |
|
71 | + } |
|
72 | 72 | |
73 | - $value = $this->systemConfig->getValue($configName); |
|
73 | + $value = $this->systemConfig->getValue($configName); |
|
74 | 74 | |
75 | - try { |
|
76 | - $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists')); |
|
77 | - } |
|
78 | - catch (\UnexpectedValueException $e) { |
|
79 | - $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
|
80 | - return 1; |
|
81 | - } |
|
75 | + try { |
|
76 | + $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists')); |
|
77 | + } |
|
78 | + catch (\UnexpectedValueException $e) { |
|
79 | + $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
|
80 | + return 1; |
|
81 | + } |
|
82 | 82 | |
83 | - $this->systemConfig->setValue($configName, $value); |
|
84 | - $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>'); |
|
85 | - return 0; |
|
86 | - } else { |
|
87 | - if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { |
|
88 | - $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>'); |
|
89 | - return 1; |
|
90 | - } |
|
83 | + $this->systemConfig->setValue($configName, $value); |
|
84 | + $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>'); |
|
85 | + return 0; |
|
86 | + } else { |
|
87 | + if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { |
|
88 | + $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>'); |
|
89 | + return 1; |
|
90 | + } |
|
91 | 91 | |
92 | - $this->systemConfig->deleteValue($configName); |
|
93 | - $output->writeln('<info>System config value ' . $configName . ' deleted</info>'); |
|
94 | - return 0; |
|
95 | - } |
|
96 | - } |
|
92 | + $this->systemConfig->deleteValue($configName); |
|
93 | + $output->writeln('<info>System config value ' . $configName . ' deleted</info>'); |
|
94 | + return 0; |
|
95 | + } |
|
96 | + } |
|
97 | 97 | |
98 | - protected function removeSubValue($keys, $currentValue, $throwError) { |
|
99 | - $nextKey = array_shift($keys); |
|
98 | + protected function removeSubValue($keys, $currentValue, $throwError) { |
|
99 | + $nextKey = array_shift($keys); |
|
100 | 100 | |
101 | - if (is_array($currentValue)) { |
|
102 | - if (isset($currentValue[$nextKey])) { |
|
103 | - if (empty($keys)) { |
|
104 | - unset($currentValue[$nextKey]); |
|
105 | - } else { |
|
106 | - $currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError); |
|
107 | - } |
|
108 | - } else if ($throwError) { |
|
109 | - throw new \UnexpectedValueException('Config parameter does not exist'); |
|
110 | - } |
|
111 | - } else if ($throwError) { |
|
112 | - throw new \UnexpectedValueException('Config parameter does not exist'); |
|
113 | - } |
|
101 | + if (is_array($currentValue)) { |
|
102 | + if (isset($currentValue[$nextKey])) { |
|
103 | + if (empty($keys)) { |
|
104 | + unset($currentValue[$nextKey]); |
|
105 | + } else { |
|
106 | + $currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError); |
|
107 | + } |
|
108 | + } else if ($throwError) { |
|
109 | + throw new \UnexpectedValueException('Config parameter does not exist'); |
|
110 | + } |
|
111 | + } else if ($throwError) { |
|
112 | + throw new \UnexpectedValueException('Config parameter does not exist'); |
|
113 | + } |
|
114 | 114 | |
115 | - return $currentValue; |
|
116 | - } |
|
115 | + return $currentValue; |
|
116 | + } |
|
117 | 117 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | if (count($configNames) > 1) { |
68 | 68 | if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { |
69 | - $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
|
69 | + $output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>'); |
|
70 | 70 | return 1; |
71 | 71 | } |
72 | 72 | |
@@ -76,21 +76,21 @@ discard block |
||
76 | 76 | $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists')); |
77 | 77 | } |
78 | 78 | catch (\UnexpectedValueException $e) { |
79 | - $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>'); |
|
79 | + $output->writeln('<error>System config '.implode(' => ', $configNames).' could not be deleted because it did not exist</error>'); |
|
80 | 80 | return 1; |
81 | 81 | } |
82 | 82 | |
83 | 83 | $this->systemConfig->setValue($configName, $value); |
84 | - $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>'); |
|
84 | + $output->writeln('<info>System config value '.implode(' => ', $configNames).' deleted</info>'); |
|
85 | 85 | return 0; |
86 | 86 | } else { |
87 | 87 | if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) { |
88 | - $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>'); |
|
88 | + $output->writeln('<error>System config '.$configName.' could not be deleted because it did not exist</error>'); |
|
89 | 89 | return 1; |
90 | 90 | } |
91 | 91 | |
92 | 92 | $this->systemConfig->deleteValue($configName); |
93 | - $output->writeln('<info>System config value ' . $configName . ' deleted</info>'); |
|
93 | + $output->writeln('<info>System config value '.$configName.' deleted</info>'); |
|
94 | 94 | return 0; |
95 | 95 | } |
96 | 96 | } |
@@ -26,53 +26,53 @@ |
||
26 | 26 | |
27 | 27 | abstract class Base extends \OC\Core\Command\Base { |
28 | 28 | |
29 | - /** @var SystemConfig */ |
|
30 | - protected $systemConfig; |
|
29 | + /** @var SystemConfig */ |
|
30 | + protected $systemConfig; |
|
31 | 31 | |
32 | - /** |
|
33 | - * @param string $argumentName |
|
34 | - * @param CompletionContext $context |
|
35 | - * @return string[] |
|
36 | - */ |
|
37 | - public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
38 | - if ($argumentName === 'name') { |
|
39 | - $words = $this->getPreviousNames($context, $context->getWordIndex()); |
|
40 | - if (empty($words)) { |
|
41 | - $completions = $this->systemConfig->getKeys(); |
|
42 | - } else { |
|
43 | - $key = array_shift($words); |
|
44 | - $value = $this->systemConfig->getValue($key); |
|
45 | - $completions = array_keys($value); |
|
32 | + /** |
|
33 | + * @param string $argumentName |
|
34 | + * @param CompletionContext $context |
|
35 | + * @return string[] |
|
36 | + */ |
|
37 | + public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
38 | + if ($argumentName === 'name') { |
|
39 | + $words = $this->getPreviousNames($context, $context->getWordIndex()); |
|
40 | + if (empty($words)) { |
|
41 | + $completions = $this->systemConfig->getKeys(); |
|
42 | + } else { |
|
43 | + $key = array_shift($words); |
|
44 | + $value = $this->systemConfig->getValue($key); |
|
45 | + $completions = array_keys($value); |
|
46 | 46 | |
47 | - while (!empty($words) && is_array($value)) { |
|
48 | - $key = array_shift($words); |
|
49 | - if (!isset($value[$key]) || !is_array($value[$key])) { |
|
50 | - break; |
|
51 | - } |
|
47 | + while (!empty($words) && is_array($value)) { |
|
48 | + $key = array_shift($words); |
|
49 | + if (!isset($value[$key]) || !is_array($value[$key])) { |
|
50 | + break; |
|
51 | + } |
|
52 | 52 | |
53 | - $value = $value[$key]; |
|
54 | - $completions = array_keys($value); |
|
55 | - } |
|
56 | - } |
|
53 | + $value = $value[$key]; |
|
54 | + $completions = array_keys($value); |
|
55 | + } |
|
56 | + } |
|
57 | 57 | |
58 | - return $completions; |
|
59 | - } |
|
60 | - return parent::completeArgumentValues($argumentName, $context); |
|
61 | - } |
|
58 | + return $completions; |
|
59 | + } |
|
60 | + return parent::completeArgumentValues($argumentName, $context); |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @param CompletionContext $context |
|
65 | - * @param int $currentIndex |
|
66 | - * @return string[] |
|
67 | - */ |
|
68 | - protected function getPreviousNames(CompletionContext $context, $currentIndex) { |
|
69 | - $word = $context->getWordAtIndex($currentIndex - 1); |
|
70 | - if ($word === $this->getName() || $currentIndex <= 0) { |
|
71 | - return []; |
|
72 | - } |
|
63 | + /** |
|
64 | + * @param CompletionContext $context |
|
65 | + * @param int $currentIndex |
|
66 | + * @return string[] |
|
67 | + */ |
|
68 | + protected function getPreviousNames(CompletionContext $context, $currentIndex) { |
|
69 | + $word = $context->getWordAtIndex($currentIndex - 1); |
|
70 | + if ($word === $this->getName() || $currentIndex <= 0) { |
|
71 | + return []; |
|
72 | + } |
|
73 | 73 | |
74 | - $words = $this->getPreviousNames($context, $currentIndex - 1); |
|
75 | - $words[] = $word; |
|
76 | - return $words; |
|
77 | - } |
|
74 | + $words = $this->getPreviousNames($context, $currentIndex - 1); |
|
75 | + $words[] = $word; |
|
76 | + return $words; |
|
77 | + } |
|
78 | 78 | } |