@@ -62,10 +62,10 @@ discard block |
||
62 | 62 | } |
63 | 63 | $languages = $lang; |
64 | 64 | if (empty($lang)) { |
65 | - $languages= $this->getAllLanguages($path); |
|
65 | + $languages = $this->getAllLanguages($path); |
|
66 | 66 | } |
67 | 67 | |
68 | - foreach($languages as $lang) { |
|
68 | + foreach ($languages as $lang) { |
|
69 | 69 | $this->writeFiles($app, $path, $lang, $output); |
70 | 70 | } |
71 | 71 | } |
@@ -73,16 +73,16 @@ discard block |
||
73 | 73 | private function getAllLanguages($path) { |
74 | 74 | $result = array(); |
75 | 75 | foreach (new DirectoryIterator("$path/l10n") as $fileInfo) { |
76 | - if($fileInfo->isDot()) { |
|
76 | + if ($fileInfo->isDot()) { |
|
77 | 77 | continue; |
78 | 78 | } |
79 | - if($fileInfo->isDir()) { |
|
79 | + if ($fileInfo->isDir()) { |
|
80 | 80 | continue; |
81 | 81 | } |
82 | - if($fileInfo->getExtension() !== 'php') { |
|
82 | + if ($fileInfo->getExtension() !== 'php') { |
|
83 | 83 | continue; |
84 | 84 | } |
85 | - $result[]= substr($fileInfo->getBasename(), 0, -4); |
|
85 | + $result[] = substr($fileInfo->getBasename(), 0, -4); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | return $result; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $jsTrans = array(); |
105 | 105 | foreach ($translations as $id => $val) { |
106 | 106 | if (is_array($val)) { |
107 | - $val = '[ ' . join(',', $val) . ']'; |
|
107 | + $val = '[ '.join(',', $val).']'; |
|
108 | 108 | } |
109 | 109 | $jsTrans[] = "\"$id\" : \"$val\""; |
110 | 110 | } |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | $this->printErrors($output, $errors); |
79 | 79 | |
80 | 80 | // ignore the OS X setup warning |
81 | - if(count($errors) !== 1 || |
|
82 | - (string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') { |
|
81 | + if (count($errors) !== 1 || |
|
82 | + (string) ($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') { |
|
83 | 83 | return 1; |
84 | 84 | } |
85 | 85 | } |
@@ -180,10 +180,10 @@ discard block |
||
180 | 180 | protected function printErrors(OutputInterface $output, $errors) { |
181 | 181 | foreach ($errors as $error) { |
182 | 182 | if (is_array($error)) { |
183 | - $output->writeln('<error>' . (string)$error['error'] . '</error>'); |
|
184 | - $output->writeln('<info> -> ' . (string)$error['hint'] . '</info>'); |
|
183 | + $output->writeln('<error>'.(string) $error['error'].'</error>'); |
|
184 | + $output->writeln('<info> -> '.(string) $error['hint'].'</info>'); |
|
185 | 185 | } else { |
186 | - $output->writeln('<error>' . (string)$error . '</error>'); |
|
186 | + $output->writeln('<error>'.(string) $error.'</error>'); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | } |
@@ -132,16 +132,16 @@ |
||
132 | 132 | $this->output->writeln(''); |
133 | 133 | break; |
134 | 134 | case '\OC\Repair::step': |
135 | - $this->output->writeln(' - ' . $event->getArgument(0)); |
|
135 | + $this->output->writeln(' - '.$event->getArgument(0)); |
|
136 | 136 | break; |
137 | 137 | case '\OC\Repair::info': |
138 | - $this->output->writeln(' - ' . $event->getArgument(0)); |
|
138 | + $this->output->writeln(' - '.$event->getArgument(0)); |
|
139 | 139 | break; |
140 | 140 | case '\OC\Repair::warning': |
141 | - $this->output->writeln(' - WARNING: ' . $event->getArgument(0)); |
|
141 | + $this->output->writeln(' - WARNING: '.$event->getArgument(0)); |
|
142 | 142 | break; |
143 | 143 | case '\OC\Repair::error': |
144 | - $this->output->writeln(' - ERROR: ' . $event->getArgument(0)); |
|
144 | + $this->output->writeln(' - ERROR: '.$event->getArgument(0)); |
|
145 | 145 | break; |
146 | 146 | } |
147 | 147 | } |
@@ -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 | } |