@@ -59,10 +59,10 @@ |
||
59 | 59 | if (is_array($value)) { |
60 | 60 | $output->writeln(" <comment>>></comment> $key:"); |
61 | 61 | foreach ($value as $subKey => $subValue) { |
62 | - $output->writeln(" <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue); |
|
62 | + $output->writeln(" <comment>>></comment> $subKey: ".str_repeat(' ', 46 - strlen($subKey)).$subValue); |
|
63 | 63 | } |
64 | 64 | } else { |
65 | - $output->writeln(" <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value); |
|
65 | + $output->writeln(" <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | return; |
93 | 93 | } |
94 | 94 | |
95 | - return $this->checkQuota($parent->getPath() . '/' . basename($uri)); |
|
95 | + return $this->checkQuota($parent->getPath().'/'.basename($uri)); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | if ($length) { |
154 | 154 | list($parentPath, $newName) = \Sabre\Uri\split($path); |
155 | - if(is_null($parentPath)) { |
|
155 | + if (is_null($parentPath)) { |
|
156 | 156 | $parentPath = ''; |
157 | 157 | } |
158 | 158 | $req = $this->server->httpRequest; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | // there is still enough space for the remaining chunks |
164 | 164 | $length -= $chunkHandler->getCurrentSize(); |
165 | 165 | // use target file name for free space check in case of shared files |
166 | - $path = rtrim($parentPath, '/') . '/' . $info['name']; |
|
166 | + $path = rtrim($parentPath, '/').'/'.$info['name']; |
|
167 | 167 | } |
168 | 168 | $freeSpace = $this->getFreeSpace($path); |
169 | 169 | if ($freeSpace >= 0 && $length > $freeSpace) { |
@@ -106,7 +106,7 @@ |
||
106 | 106 | $suffix = '…'; |
107 | 107 | } |
108 | 108 | |
109 | - return $prefix . substr($message, $start, $end - $start) . $suffix; |
|
109 | + return $prefix.substr($message, $start, $end - $start).$suffix; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | ) { |
59 | 59 | $backend = $this->backendService->getBackend($storageOptions['backend']); |
60 | 60 | if (!$backend) { |
61 | - throw new \UnexpectedValueException('Invalid backend ' . $storageOptions['backend']); |
|
61 | + throw new \UnexpectedValueException('Invalid backend '.$storageOptions['backend']); |
|
62 | 62 | } |
63 | 63 | $storageConfig->setBackend($backend); |
64 | 64 | if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $storageOptions['authMechanism'] = 'null'; // to make error handling easier |
69 | 69 | } |
70 | 70 | if (!$authMechanism) { |
71 | - throw new \UnexpectedValueException('Invalid authentication mechanism ' . $storageOptions['authMechanism']); |
|
71 | + throw new \UnexpectedValueException('Invalid authentication mechanism '.$storageOptions['authMechanism']); |
|
72 | 72 | } |
73 | 73 | $storageConfig->setAuthMechanism($authMechanism); |
74 | 74 | $storageConfig->setBackendOptions($storageOptions['options']); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $parts = explode('/', ltrim($rootMountPath, '/'), 3); |
141 | 141 | if (count($parts) < 3) { |
142 | 142 | // something went wrong, skip |
143 | - \OC::$server->getLogger()->error('Could not parse mount point "' . $rootMountPath . '"', ['app' => 'files_external']); |
|
143 | + \OC::$server->getLogger()->error('Could not parse mount point "'.$rootMountPath.'"', ['app' => 'files_external']); |
|
144 | 144 | continue; |
145 | 145 | } |
146 | 146 | $relativeMountPath = rtrim($parts[2], '/'); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $storageOptions['authMechanism'] = null; // ensure config hash works |
155 | 155 | } |
156 | 156 | if (isset($storageOptions['id'])) { |
157 | - $configId = (int)$storageOptions['id']; |
|
157 | + $configId = (int) $storageOptions['id']; |
|
158 | 158 | if (isset($storages[$configId])) { |
159 | 159 | $currentStorage = $storages[$configId]; |
160 | 160 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * |
48 | 48 | * @package OCA\Federation\Controller |
49 | 49 | */ |
50 | -class OCSAuthAPIController extends OCSController{ |
|
50 | +class OCSAuthAPIController extends OCSController { |
|
51 | 51 | |
52 | 52 | /** @var ISecureRandom */ |
53 | 53 | private $secureRandom; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | public function requestSharedSecret($url, $token) { |
145 | 145 | if ($this->trustedServers->isTrustedServer($url) === false) { |
146 | - $this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']); |
|
146 | + $this->logger->error('remote server not trusted ('.$url.') while requesting shared secret', ['app' => 'federation']); |
|
147 | 147 | throw new OCSForbiddenException(); |
148 | 148 | } |
149 | 149 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | $localToken = $this->dbHandler->getToken($url); |
153 | 153 | if (strcmp($localToken, $token) > 0) { |
154 | 154 | $this->logger->info( |
155 | - 'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.', |
|
155 | + 'remote server ('.$url.') presented lower token. We will initiate the exchange of the shared secret.', |
|
156 | 156 | ['app' => 'federation'] |
157 | 157 | ); |
158 | 158 | throw new OCSForbiddenException(); |
@@ -184,14 +184,14 @@ discard block |
||
184 | 184 | public function getSharedSecret($url, $token) { |
185 | 185 | |
186 | 186 | if ($this->trustedServers->isTrustedServer($url) === false) { |
187 | - $this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']); |
|
187 | + $this->logger->error('remote server not trusted ('.$url.') while getting shared secret', ['app' => 'federation']); |
|
188 | 188 | throw new OCSForbiddenException(); |
189 | 189 | } |
190 | 190 | |
191 | 191 | if ($this->isValidToken($url, $token) === false) { |
192 | 192 | $expectedToken = $this->dbHandler->getToken($url); |
193 | 193 | $this->logger->error( |
194 | - 'remote server (' . $url . ') didn\'t send a valid token (got "' . $token . '" but expected "'. $expectedToken . '") while getting shared secret', |
|
194 | + 'remote server ('.$url.') didn\'t send a valid token (got "'.$token.'" but expected "'.$expectedToken.'") while getting shared secret', |
|
195 | 195 | ['app' => 'federation'] |
196 | 196 | ); |
197 | 197 | throw new OCSForbiddenException(); |
@@ -68,13 +68,13 @@ discard block |
||
68 | 68 | * @param string[] $remove |
69 | 69 | */ |
70 | 70 | public function updateShares(IShareable $shareable, array $add, array $remove) { |
71 | - foreach($add as $element) { |
|
71 | + foreach ($add as $element) { |
|
72 | 72 | $principal = $this->principalBackend->findByUri($element['href'], ''); |
73 | 73 | if ($principal !== '') { |
74 | 74 | $this->shareWith($shareable, $element); |
75 | 75 | } |
76 | 76 | } |
77 | - foreach($remove as $element) { |
|
77 | + foreach ($remove as $element) { |
|
78 | 78 | $principal = $this->principalBackend->findByUri($element, ''); |
79 | 79 | if ($principal !== '') { |
80 | 80 | $this->unshare($shareable, $element); |
@@ -193,9 +193,9 @@ discard block |
||
193 | 193 | ->execute(); |
194 | 194 | |
195 | 195 | $shares = []; |
196 | - while($row = $result->fetch()) { |
|
196 | + while ($row = $result->fetch()) { |
|
197 | 197 | $p = $this->principalBackend->getPrincipalByPath($row['principaluri']); |
198 | - $shares[]= [ |
|
198 | + $shares[] = [ |
|
199 | 199 | 'href' => "principal:${row['principaluri']}", |
200 | 200 | 'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '', |
201 | 201 | 'status' => 1, |
@@ -221,13 +221,13 @@ discard block |
||
221 | 221 | foreach ($shares as $share) { |
222 | 222 | $acl[] = [ |
223 | 223 | 'privilege' => '{DAV:}read', |
224 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
224 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
225 | 225 | 'protected' => true, |
226 | 226 | ]; |
227 | 227 | if (!$share['readOnly']) { |
228 | 228 | $acl[] = [ |
229 | 229 | 'privilege' => '{DAV:}write', |
230 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
230 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
231 | 231 | 'protected' => true, |
232 | 232 | ]; |
233 | 233 | } else if ($this->resourceType === 'calendar') { |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | // so users can change the visibility. |
236 | 236 | $acl[] = [ |
237 | 237 | 'privilege' => '{DAV:}write-properties', |
238 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
238 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
239 | 239 | 'protected' => true, |
240 | 240 | ]; |
241 | 241 | } |
@@ -88,7 +88,7 @@ |
||
88 | 88 | * @param string $mode |
89 | 89 | * @return DataResponse|FileDisplayResponse |
90 | 90 | */ |
91 | - public function getPreview ( |
|
91 | + public function getPreview( |
|
92 | 92 | string $file = '', |
93 | 93 | int $x = 32, |
94 | 94 | int $y = 32, |
@@ -72,8 +72,8 @@ |
||
72 | 72 | |
73 | 73 | $convertedAddresses = []; |
74 | 74 | |
75 | - foreach($addresses as $email => $readableName) { |
|
76 | - if(!is_numeric($email)) { |
|
75 | + foreach ($addresses as $email => $readableName) { |
|
76 | + if (!is_numeric($email)) { |
|
77 | 77 | list($name, $domain) = explode('@', $email, 2); |
78 | 78 | $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46); |
79 | 79 | $convertedAddresses[$name.'@'.$domain] = $readableName; |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | |
403 | 403 | $this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]); |
404 | 404 | if ($plainTitle !== false) { |
405 | - $this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL; |
|
405 | + $this->plainBody .= $plainTitle.PHP_EOL.PHP_EOL; |
|
406 | 406 | } |
407 | 407 | } |
408 | 408 | |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | |
439 | 439 | $this->htmlBody .= vsprintf($this->bodyText, [$text]); |
440 | 440 | if ($plainText !== false) { |
441 | - $this->plainBody .= $plainText . PHP_EOL . PHP_EOL; |
|
441 | + $this->plainBody .= $plainText.PHP_EOL.PHP_EOL; |
|
442 | 442 | } |
443 | 443 | } |
444 | 444 | |
@@ -468,18 +468,18 @@ discard block |
||
468 | 468 | |
469 | 469 | $htmlText = $text; |
470 | 470 | if ($metaInfo) { |
471 | - $htmlText = '<em style="color:#777;">' . $metaInfo . '</em><br>' . $htmlText; |
|
471 | + $htmlText = '<em style="color:#777;">'.$metaInfo.'</em><br>'.$htmlText; |
|
472 | 472 | } |
473 | 473 | if ($icon !== '') { |
474 | - $icon = '<img src="' . htmlspecialchars($icon) . '" alt="•">'; |
|
474 | + $icon = '<img src="'.htmlspecialchars($icon).'" alt="•">'; |
|
475 | 475 | } else { |
476 | 476 | $icon = '•'; |
477 | 477 | } |
478 | 478 | $this->htmlBody .= vsprintf($this->listItem, [$icon, $htmlText]); |
479 | 479 | if ($plainText !== false) { |
480 | - $this->plainBody .= ' * ' . $plainText; |
|
480 | + $this->plainBody .= ' * '.$plainText; |
|
481 | 481 | if ($plainMetaInfo !== false) { |
482 | - $this->plainBody .= ' (' . $plainMetaInfo . ')'; |
|
482 | + $this->plainBody .= ' ('.$plainMetaInfo.')'; |
|
483 | 483 | } |
484 | 484 | $this->plainBody .= PHP_EOL; |
485 | 485 | } |
@@ -540,8 +540,8 @@ discard block |
||
540 | 540 | $textColor = $this->themingDefaults->getTextColorPrimary(); |
541 | 541 | |
542 | 542 | $this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]); |
543 | - $this->plainBody .= $plainTextLeft . ': ' . $urlLeft . PHP_EOL; |
|
544 | - $this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL; |
|
543 | + $this->plainBody .= $plainTextLeft.': '.$urlLeft.PHP_EOL; |
|
544 | + $this->plainBody .= $plainTextRight.': '.$urlRight.PHP_EOL.PHP_EOL; |
|
545 | 545 | |
546 | 546 | } |
547 | 547 | |
@@ -573,10 +573,10 @@ discard block |
||
573 | 573 | $this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, $textColor, $textColor, $text]); |
574 | 574 | |
575 | 575 | if ($plainText !== false) { |
576 | - $this->plainBody .= $plainText . ': '; |
|
576 | + $this->plainBody .= $plainText.': '; |
|
577 | 577 | } |
578 | 578 | |
579 | - $this->plainBody .= $url . PHP_EOL; |
|
579 | + $this->plainBody .= $url.PHP_EOL; |
|
580 | 580 | |
581 | 581 | } |
582 | 582 | |
@@ -600,8 +600,8 @@ discard block |
||
600 | 600 | * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used |
601 | 601 | */ |
602 | 602 | public function addFooter(string $text = '') { |
603 | - if($text === '') { |
|
604 | - $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically sent email, please do not reply.'); |
|
603 | + if ($text === '') { |
|
604 | + $text = $this->themingDefaults->getName().' - '.$this->themingDefaults->getSlogan().'<br>'.$this->l10n->t('This is an automatically sent email, please do not reply.'); |
|
605 | 605 | } |
606 | 606 | |
607 | 607 | if ($this->footerAdded) { |
@@ -613,7 +613,7 @@ discard block |
||
613 | 613 | |
614 | 614 | $this->htmlBody .= vsprintf($this->footer, [$text]); |
615 | 615 | $this->htmlBody .= $this->tail; |
616 | - $this->plainBody .= PHP_EOL . '-- ' . PHP_EOL; |
|
616 | + $this->plainBody .= PHP_EOL.'-- '.PHP_EOL; |
|
617 | 617 | $this->plainBody .= str_replace('<br>', PHP_EOL, $text); |
618 | 618 | } |
619 | 619 |