@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $this->output = $output; |
88 | 88 | |
89 | 89 | if ($user !== '' && $this->userManager->userExists($user) === false) { |
90 | - $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again'); |
|
90 | + $this->output->writeln('User "'.$user.'" does not exist. Please check the username and try again'); |
|
91 | 91 | return false; |
92 | 92 | } |
93 | 93 | |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | $this->output->writeln('Files for following users couldn\'t be decrypted, '); |
106 | 106 | $this->output->writeln('maybe the user is not set up in a way that supports this operation: '); |
107 | 107 | foreach ($this->failed as $uid => $paths) { |
108 | - $this->output->writeln(' ' . $uid); |
|
108 | + $this->output->writeln(' '.$uid); |
|
109 | 109 | foreach ($paths as $path) { |
110 | - $this->output->writeln(' ' . $path); |
|
110 | + $this->output->writeln(' '.$path); |
|
111 | 111 | } |
112 | 112 | } |
113 | 113 | $this->output->writeln(''); |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | /** @var IEncryptionModule $module */ |
130 | 130 | $module = call_user_func($moduleDesc['callback']); |
131 | 131 | $this->output->writeln(''); |
132 | - $this->output->writeln('Prepare "' . $module->getDisplayName() . '"'); |
|
132 | + $this->output->writeln('Prepare "'.$module->getDisplayName().'"'); |
|
133 | 133 | $this->output->writeln(''); |
134 | 134 | if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) { |
135 | - $this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!'); |
|
135 | + $this->output->writeln('Module "'.$moduleDesc['displayName'].'" does not support the functionality to decrypt all files again or the initialization of the module failed!'); |
|
136 | 136 | return false; |
137 | 137 | } |
138 | 138 | } |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) { |
207 | 207 | $this->setupUserFS($uid); |
208 | 208 | $directories = []; |
209 | - $directories[] = '/' . $uid . '/files'; |
|
209 | + $directories[] = '/'.$uid.'/files'; |
|
210 | 210 | |
211 | 211 | while ($root = array_pop($directories)) { |
212 | 212 | $content = $this->rootView->getDirectoryContent($root); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | if ($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) { |
216 | 216 | continue; |
217 | 217 | } |
218 | - $path = $root . '/' . $file['name']; |
|
218 | + $path = $root.'/'.$file['name']; |
|
219 | 219 | if ($this->rootView->is_dir($path)) { |
220 | 220 | $directories[] = $path; |
221 | 221 | continue; |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | } |
260 | 260 | |
261 | 261 | $source = $path; |
262 | - $target = $path . '.decrypted.' . $this->getTimestamp(); |
|
262 | + $target = $path.'.decrypted.'.$this->getTimestamp(); |
|
263 | 263 | |
264 | 264 | try { |
265 | 265 | $this->rootView->copy($source, $target); |
@@ -38,7 +38,7 @@ |
||
38 | 38 | |
39 | 39 | public function run($dummy) { |
40 | 40 | $systemConfig = \OC::$server->getSystemConfig(); |
41 | - $this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log'); |
|
41 | + $this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log'); |
|
42 | 42 | |
43 | 43 | $this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024); |
44 | 44 | if ($this->shouldRotateBySize()) { |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function getKey(IUser $user): Key { |
146 | 146 | $uid = $user->getUID(); |
147 | - return $this->retrieveKey('user-' . $uid); |
|
147 | + return $this->retrieveKey('user-'.$uid); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | if ($instanceId === null) { |
159 | 159 | throw new \RuntimeException('no instance id!'); |
160 | 160 | } |
161 | - return $this->retrieveKey('system-' . $instanceId); |
|
161 | + return $this->retrieveKey('system-'.$instanceId); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | private function logOpensslError(): void { |
@@ -166,6 +166,6 @@ discard block |
||
166 | 166 | while ($error = openssl_error_string()) { |
167 | 167 | $errors[] = $error; |
168 | 168 | } |
169 | - $this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors)); |
|
169 | + $this->logger->critical('Something is wrong with your openssl setup: '.implode(', ', $errors)); |
|
170 | 170 | } |
171 | 171 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | public function getEncryptedValue(): string { |
58 | 58 | if ($this->encryptedValue === '') { |
59 | 59 | $sharedSecret = random_bytes(\strlen($this->value)); |
60 | - $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret); |
|
60 | + $this->encryptedValue = base64_encode($this->value ^ $sharedSecret).':'.base64_encode($sharedSecret); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | return $this->encryptedValue; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | */ |
75 | 75 | public function mergePolicies(ContentSecurityPolicy $defaultPolicy, |
76 | 76 | EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy { |
77 | - foreach ((object)(array)$originalPolicy as $name => $value) { |
|
77 | + foreach ((object) (array) $originalPolicy as $name => $value) { |
|
78 | 78 | $setter = 'set'.ucfirst($name); |
79 | 79 | if (\is_array($value)) { |
80 | 80 | $getter = 'get'.ucfirst($name); |
@@ -96,14 +96,14 @@ discard block |
||
96 | 96 | $alg = $this->getPrefferedAlgorithm(); |
97 | 97 | |
98 | 98 | if (\defined('PASSWORD_ARGON2ID') && $alg === PASSWORD_ARGON2ID) { |
99 | - return 3 . '|' . password_hash($message, PASSWORD_ARGON2ID, $this->options); |
|
99 | + return 3.'|'.password_hash($message, PASSWORD_ARGON2ID, $this->options); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | if (\defined('PASSWORD_ARGON2I') && $alg === PASSWORD_ARGON2I) { |
103 | - return 2 . '|' . password_hash($message, PASSWORD_ARGON2I, $this->options); |
|
103 | + return 2.'|'.password_hash($message, PASSWORD_ARGON2I, $this->options); |
|
104 | 104 | } |
105 | 105 | |
106 | - return 1 . '|' . password_hash($message, PASSWORD_BCRYPT, $this->options); |
|
106 | + return 1.'|'.password_hash($message, PASSWORD_BCRYPT, $this->options); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | protected function splitHash(string $prefixedHash) { |
115 | 115 | $explodedString = explode('|', $prefixedHash, 2); |
116 | 116 | if (\count($explodedString) === 2) { |
117 | - if ((int)$explodedString[0] > 0) { |
|
118 | - return ['version' => (int)$explodedString[0], 'hash' => $explodedString[1]]; |
|
117 | + if ((int) $explodedString[0] > 0) { |
|
118 | + return ['version' => (int) $explodedString[0], 'hash' => $explodedString[1]]; |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 |
@@ -99,7 +99,7 @@ |
||
99 | 99 | $emailAddressType = $emailAddressData['type']; |
100 | 100 | } |
101 | 101 | if (isset($contact['FN'])) { |
102 | - $displayName = $contact['FN'] . ' (' . $emailAddress . ')'; |
|
102 | + $displayName = $contact['FN'].' ('.$emailAddress.')'; |
|
103 | 103 | } |
104 | 104 | $exactEmailMatch = strtolower($emailAddress) === $lowerSearch; |
105 | 105 |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $request = $this->prepareRequest($request, $credentials); |
65 | 65 | $stringToSign = $this->createCanonicalizedString($request); |
66 | 66 | $auth = 'AWS ' |
67 | - . $credentials->getAccessKeyId() . ':' |
|
67 | + . $credentials->getAccessKeyId().':' |
|
68 | 68 | . $this->signString($stringToSign, $credentials); |
69 | 69 | |
70 | 70 | return $request->withHeader('Authorization', $auth); |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | RequestInterface $request, |
149 | 149 | $expires = null |
150 | 150 | ) { |
151 | - $buffer = $request->getMethod() . "\n"; |
|
151 | + $buffer = $request->getMethod()."\n"; |
|
152 | 152 | |
153 | 153 | // Add the interesting headers |
154 | 154 | foreach ($this->signableHeaders as $header) { |
155 | - $buffer .= $request->getHeaderLine($header) . "\n"; |
|
155 | + $buffer .= $request->getHeaderLine($header)."\n"; |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | $date = $expires ?: $request->getHeaderLine('date'); |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | if (strpos($name, 'x-amz-') === 0) { |
171 | 171 | $value = implode(',', $header); |
172 | 172 | if (strlen($value) > 0) { |
173 | - $headers[$name] = $name . ':' . $value; |
|
173 | + $headers[$name] = $name.':'.$value; |
|
174 | 174 | } |
175 | 175 | } |
176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | ksort($headers); |
183 | 183 | |
184 | - return implode("\n", $headers) . "\n"; |
|
184 | + return implode("\n", $headers)."\n"; |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | private function createCanonicalizedResource(RequestInterface $request) { |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | if ($data['bucket']) { |
192 | 192 | $buffer .= $data['bucket']; |
193 | 193 | if (!empty($data['key']) || !$data['path_style']) { |
194 | - $buffer .= '/' . $data['key']; |
|
194 | + $buffer .= '/'.$data['key']; |
|
195 | 195 | } |
196 | 196 | } |
197 | 197 |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | return; |
174 | 174 | } |
175 | 175 | |
176 | - $this->dispatcher->dispatch(IGroup::class . '::preAddUser', new GenericEvent($this, [ |
|
176 | + $this->dispatcher->dispatch(IGroup::class.'::preAddUser', new GenericEvent($this, [ |
|
177 | 177 | 'user' => $user, |
178 | 178 | ])); |
179 | 179 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $this->users[$user->getUID()] = $user; |
188 | 188 | } |
189 | 189 | |
190 | - $this->dispatcher->dispatch(IGroup::class . '::postAddUser', new GenericEvent($this, [ |
|
190 | + $this->dispatcher->dispatch(IGroup::class.'::postAddUser', new GenericEvent($this, [ |
|
191 | 191 | 'user' => $user, |
192 | 192 | ])); |
193 | 193 | |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | */ |
207 | 207 | public function removeUser($user) { |
208 | 208 | $result = false; |
209 | - $this->dispatcher->dispatch(IGroup::class . '::preRemoveUser', new GenericEvent($this, [ |
|
209 | + $this->dispatcher->dispatch(IGroup::class.'::preRemoveUser', new GenericEvent($this, [ |
|
210 | 210 | 'user' => $user, |
211 | 211 | ])); |
212 | 212 | if ($this->emitter) { |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | } |
220 | 220 | } |
221 | 221 | if ($result) { |
222 | - $this->dispatcher->dispatch(IGroup::class . '::postRemoveUser', new GenericEvent($this, [ |
|
222 | + $this->dispatcher->dispatch(IGroup::class.'::postRemoveUser', new GenericEvent($this, [ |
|
223 | 223 | 'user' => $user, |
224 | 224 | ])); |
225 | 225 | if ($this->emitter) { |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | $result = false; |
332 | - $this->dispatcher->dispatch(IGroup::class . '::preDelete', new GenericEvent($this)); |
|
332 | + $this->dispatcher->dispatch(IGroup::class.'::preDelete', new GenericEvent($this)); |
|
333 | 333 | if ($this->emitter) { |
334 | 334 | $this->emitter->emit('\OC\Group', 'preDelete', [$this]); |
335 | 335 | } |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | } |
341 | 341 | } |
342 | 342 | if ($result) { |
343 | - $this->dispatcher->dispatch(IGroup::class . '::postDelete', new GenericEvent($this)); |
|
343 | + $this->dispatcher->dispatch(IGroup::class.'::postDelete', new GenericEvent($this)); |
|
344 | 344 | if ($this->emitter) { |
345 | 345 | $this->emitter->emit('\OC\Group', 'postDelete', [$this]); |
346 | 346 | } |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | * @since 16.0.0 |
399 | 399 | */ |
400 | 400 | public function hideFromCollaboration(): bool { |
401 | - return array_reduce($this->backends, function (bool $hide, GroupInterface $backend) { |
|
401 | + return array_reduce($this->backends, function(bool $hide, GroupInterface $backend) { |
|
402 | 402 | return $hide | ($backend instanceof IHideFromCollaborationBackend && $backend->hideGroup($this->gid)); |
403 | 403 | }, false); |
404 | 404 | } |