@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $appId = $input->getArgument('app-id'); |
71 | 71 | |
72 | 72 | if (!\OC_App::getAppPath($appId)) { |
73 | - $output->writeln($appId . ' not found'); |
|
73 | + $output->writeln($appId.' not found'); |
|
74 | 74 | return 1; |
75 | 75 | } |
76 | 76 | |
@@ -78,10 +78,10 @@ discard block |
||
78 | 78 | $appClass = new \OC_App(); |
79 | 79 | if (empty($groups)) { |
80 | 80 | $appClass->enable($appId); |
81 | - $output->writeln($appId . ' enabled'); |
|
81 | + $output->writeln($appId.' enabled'); |
|
82 | 82 | } else { |
83 | 83 | $appClass->enable($appId, $groups); |
84 | - $output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups)); |
|
84 | + $output->writeln($appId.' enabled for groups: '.implode(', ', $groups)); |
|
85 | 85 | } |
86 | 86 | return 0; |
87 | 87 | } |
@@ -62,13 +62,13 @@ |
||
62 | 62 | if ($this->manager->isInstalled($appId)) { |
63 | 63 | try { |
64 | 64 | $this->manager->disableApp($appId); |
65 | - $output->writeln($appId . ' disabled'); |
|
66 | - } catch(\Exception $e) { |
|
65 | + $output->writeln($appId.' disabled'); |
|
66 | + } catch (\Exception $e) { |
|
67 | 67 | $output->writeln($e->getMessage()); |
68 | 68 | return 2; |
69 | 69 | } |
70 | 70 | } else { |
71 | - $output->writeln('No such app enabled: ' . $appId); |
|
71 | + $output->writeln('No such app enabled: '.$appId); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 |
@@ -28,7 +28,7 @@ |
||
28 | 28 | use Symfony\Component\Console\Input\InputInterface; |
29 | 29 | use Symfony\Component\Console\Output\OutputInterface; |
30 | 30 | |
31 | -class ShowKeyStorageRoot extends Command{ |
|
31 | +class ShowKeyStorageRoot extends Command { |
|
32 | 32 | |
33 | 33 | /** @var Util */ |
34 | 34 | protected $util; |
@@ -70,9 +70,9 @@ |
||
70 | 70 | if ($defaultModule === null) { |
71 | 71 | $output->writeln('<error>No default module is set</error>'); |
72 | 72 | } else if (!isset($modules[$defaultModule])) { |
73 | - $output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>'); |
|
73 | + $output->writeln('<error>The current default module does not exist: '.$defaultModule.'</error>'); |
|
74 | 74 | } else { |
75 | - $output->writeln('Default module: ' . $defaultModule); |
|
75 | + $output->writeln('Default module: '.$defaultModule); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | if (!$item['default']) { |
72 | 72 | $item = $item['displayName']; |
73 | 73 | } else { |
74 | - $item = $item['displayName'] . ' [default*]'; |
|
74 | + $item = $item['displayName'].' [default*]'; |
|
75 | 75 | } |
76 | 76 | }); |
77 | 77 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | $result = $this->rootView->file_put_contents( |
145 | - $newRoot . '/' . Storage::KEY_STORAGE_MARKER, |
|
145 | + $newRoot.'/'.Storage::KEY_STORAGE_MARKER, |
|
146 | 146 | 'ownCloud will detect this folder as key storage root only if this file exists' |
147 | 147 | ); |
148 | 148 | |
@@ -161,10 +161,10 @@ discard block |
||
161 | 161 | */ |
162 | 162 | protected function moveSystemKeys($oldRoot, $newRoot) { |
163 | 163 | if ( |
164 | - $this->rootView->is_dir($oldRoot . '/files_encryption') && |
|
165 | - $this->targetExists($newRoot . '/files_encryption') === false |
|
164 | + $this->rootView->is_dir($oldRoot.'/files_encryption') && |
|
165 | + $this->targetExists($newRoot.'/files_encryption') === false |
|
166 | 166 | ) { |
167 | - $this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption'); |
|
167 | + $this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption'); |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $progress->start(); |
194 | 194 | |
195 | 195 | |
196 | - foreach($this->userManager->getBackends() as $backend) { |
|
196 | + foreach ($this->userManager->getBackends() as $backend) { |
|
197 | 197 | $limit = 500; |
198 | 198 | $offset = 0; |
199 | 199 | do { |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | $this->moveUserEncryptionFolder($user, $oldRoot, $newRoot); |
205 | 205 | } |
206 | 206 | $offset += $limit; |
207 | - } while(count($users) >= $limit); |
|
207 | + } while (count($users) >= $limit); |
|
208 | 208 | } |
209 | 209 | $progress->finish(); |
210 | 210 | } |
@@ -221,13 +221,13 @@ discard block |
||
221 | 221 | |
222 | 222 | if ($this->userManager->userExists($user)) { |
223 | 223 | |
224 | - $source = $oldRoot . '/' . $user . '/files_encryption'; |
|
225 | - $target = $newRoot . '/' . $user . '/files_encryption'; |
|
224 | + $source = $oldRoot.'/'.$user.'/files_encryption'; |
|
225 | + $target = $newRoot.'/'.$user.'/files_encryption'; |
|
226 | 226 | if ( |
227 | 227 | $this->rootView->is_dir($source) && |
228 | 228 | $this->targetExists($target) === false |
229 | 229 | ) { |
230 | - $this->prepareParentFolder($newRoot . '/' . $user); |
|
230 | + $this->prepareParentFolder($newRoot.'/'.$user); |
|
231 | 231 | $this->rootView->rename($source, $target); |
232 | 232 | } |
233 | 233 | } |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | $sub_dirs = explode('/', ltrim($path, '/')); |
246 | 246 | $dir = ''; |
247 | 247 | foreach ($sub_dirs as $sub_dir) { |
248 | - $dir .= '/' . $sub_dir; |
|
248 | + $dir .= '/'.$sub_dir; |
|
249 | 249 | if ($this->rootView->file_exists($dir) === false) { |
250 | 250 | $this->rootView->mkdir($dir); |
251 | 251 | } |
@@ -59,11 +59,11 @@ |
||
59 | 59 | $moduleId = $input->getArgument('module'); |
60 | 60 | |
61 | 61 | if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) { |
62 | - $output->writeln('"' . $moduleId . '"" is already the default module'); |
|
62 | + $output->writeln('"'.$moduleId.'"" is already the default module'); |
|
63 | 63 | } else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) { |
64 | - $output->writeln('<info>Set default module to "' . $moduleId . '"</info>'); |
|
64 | + $output->writeln('<info>Set default module to "'.$moduleId.'"</info>'); |
|
65 | 65 | } else { |
66 | - $output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>'); |
|
66 | + $output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>'); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | protected function execute(InputInterface $input, OutputInterface $output) { |
74 | - $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); |
|
74 | + $groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset')); |
|
75 | 75 | $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups)); |
76 | 76 | } |
77 | 77 | |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | * @return array |
81 | 81 | */ |
82 | 82 | private function formatGroups(array $groups) { |
83 | - $keys = array_map(function (IGroup $group) { |
|
83 | + $keys = array_map(function(IGroup $group) { |
|
84 | 84 | return $group->getGID(); |
85 | 85 | }, $groups); |
86 | - $values = array_map(function (IGroup $group) { |
|
86 | + $values = array_map(function(IGroup $group) { |
|
87 | 87 | return array_keys($group->getUsers()); |
88 | 88 | }, $groups); |
89 | 89 | return array_combine($keys, $values); |
@@ -29,17 +29,17 @@ |
||
29 | 29 | // because base.php will already use 5.6 syntax. |
30 | 30 | if (version_compare(PHP_VERSION, '5.6.0') === -1) { |
31 | 31 | echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; |
32 | - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; |
|
32 | + echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.'; |
|
33 | 33 | return; |
34 | 34 | } |
35 | 35 | |
36 | 36 | try { |
37 | 37 | |
38 | - require_once __DIR__ . '/lib/base.php'; |
|
38 | + require_once __DIR__.'/lib/base.php'; |
|
39 | 39 | |
40 | 40 | OC::handleRequest(); |
41 | 41 | |
42 | -} catch(\OC\ServiceUnavailableException $ex) { |
|
42 | +} catch (\OC\ServiceUnavailableException $ex) { |
|
43 | 43 | \OC::$server->getLogger()->logException($ex, array('app' => 'index')); |
44 | 44 | |
45 | 45 | //show the user a detailed error page |