@@ -141,7 +141,7 @@ |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // wait with registering these until auth is handled and the filesystem is setup |
| 144 | - $server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) { |
|
| 144 | + $server->on('beforeMethod:*', function() use ($server, $objectTree, $viewCallBack) { |
|
| 145 | 145 | // ensure the skeleton is copied |
| 146 | 146 | $userFolder = \OC::$server->getUserFolder(); |
| 147 | 147 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | * @return boolean |
| 107 | 107 | */ |
| 108 | 108 | public function httpGet(RequestInterface $request, ResponseInterface $response):bool { |
| 109 | - if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) { |
|
| 109 | + if ($request->getPath() !== 'provisioning/'.AppleProvisioningNode::FILENAME) { |
|
| 110 | 110 | return true; |
| 111 | 111 | } |
| 112 | 112 | |
@@ -144,19 +144,19 @@ discard block |
||
| 144 | 144 | $carddavUUID = call_user_func($this->uuidClosure); |
| 145 | 145 | $profileUUID = call_user_func($this->uuidClosure); |
| 146 | 146 | |
| 147 | - $caldavIdentifier = $reverseDomain . '.' . $caldavUUID; |
|
| 148 | - $carddavIdentifier = $reverseDomain . '.' . $carddavUUID; |
|
| 149 | - $profileIdentifier = $reverseDomain . '.' . $profileUUID; |
|
| 147 | + $caldavIdentifier = $reverseDomain.'.'.$caldavUUID; |
|
| 148 | + $carddavIdentifier = $reverseDomain.'.'.$carddavUUID; |
|
| 149 | + $profileIdentifier = $reverseDomain.'.'.$profileUUID; |
|
| 150 | 150 | |
| 151 | 151 | $caldavDescription = $this->l10n->t('Configures a CalDAV account'); |
| 152 | - $caldavDisplayname = $description . ' CalDAV'; |
|
| 152 | + $caldavDisplayname = $description.' CalDAV'; |
|
| 153 | 153 | $carddavDescription = $this->l10n->t('Configures a CardDAV account'); |
| 154 | - $carddavDisplayname = $description . ' CardDAV'; |
|
| 154 | + $carddavDisplayname = $description.' CardDAV'; |
|
| 155 | 155 | |
| 156 | - $filename = $userId . '-' . AppleProvisioningNode::FILENAME; |
|
| 156 | + $filename = $userId.'-'.AppleProvisioningNode::FILENAME; |
|
| 157 | 157 | |
| 158 | 158 | $xmlSkeleton = $this->getTemplate(); |
| 159 | - $body = vsprintf($xmlSkeleton, array_map(function ($v) { |
|
| 159 | + $body = vsprintf($xmlSkeleton, array_map(function($v) { |
|
| 160 | 160 | return \htmlspecialchars($v, ENT_XML1, 'UTF-8'); |
| 161 | 161 | }, [ |
| 162 | 162 | $description, |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | )); |
| 183 | 183 | |
| 184 | 184 | $response->setStatus(200); |
| 185 | - $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
| 185 | + $response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); |
|
| 186 | 186 | $response->setHeader('Content-Type', 'application/xml; charset=utf-8'); |
| 187 | 187 | $response->setBody($body); |
| 188 | 188 | |
@@ -60,16 +60,16 @@ discard block |
||
| 60 | 60 | ], |
| 61 | 61 | [ |
| 62 | 62 | 'privilege' => '{DAV:}read', |
| 63 | - 'principal' => $this->getOwner() . '/calendar-proxy-write', |
|
| 63 | + 'principal' => $this->getOwner().'/calendar-proxy-write', |
|
| 64 | 64 | 'protected' => true, |
| 65 | 65 | ], |
| 66 | 66 | [ |
| 67 | 67 | 'privilege' => '{DAV:}read', |
| 68 | - 'principal' => $this->getOwner() . '/calendar-proxy-read', |
|
| 68 | + 'principal' => $this->getOwner().'/calendar-proxy-read', |
|
| 69 | 69 | 'protected' => true, |
| 70 | 70 | ], |
| 71 | 71 | [ |
| 72 | - 'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy', |
|
| 72 | + 'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy', |
|
| 73 | 73 | 'principal' => '{DAV:}authenticated', |
| 74 | 74 | 'protected' => true, |
| 75 | 75 | ], |
@@ -89,12 +89,12 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | [ |
| 91 | 91 | 'privilege' => '{DAV:}read', |
| 92 | - 'principal' => $this->getOwner() . '/calendar-proxy-write', |
|
| 92 | + 'principal' => $this->getOwner().'/calendar-proxy-write', |
|
| 93 | 93 | 'protected' => true, |
| 94 | 94 | ], |
| 95 | 95 | [ |
| 96 | 96 | 'privilege' => '{DAV:}read', |
| 97 | - 'principal' => $this->getOwner() . '/calendar-proxy-read', |
|
| 97 | + 'principal' => $this->getOwner().'/calendar-proxy-read', |
|
| 98 | 98 | 'protected' => true, |
| 99 | 99 | ], |
| 100 | 100 | |
@@ -256,10 +256,10 @@ discard block |
||
| 256 | 256 | ]); |
| 257 | 257 | |
| 258 | 258 | return $localeStart |
| 259 | - . ' (' . $startTimezone . ') ' |
|
| 259 | + . ' ('.$startTimezone.') ' |
|
| 260 | 260 | . ' - ' |
| 261 | 261 | . $localeEnd |
| 262 | - . ' (' . $endTimezone . ')'; |
|
| 262 | + . ' ('.$endTimezone.')'; |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // Show only the time if the day is the same |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | return $localeStart |
| 274 | 274 | . ' - ' |
| 275 | 275 | . $localeEnd |
| 276 | - . ' (' . $startTimezone . ')'; |
|
| 276 | + . ' ('.$startTimezone.')'; |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $readOnly = false; |
| 80 | - $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'; |
|
| 80 | + $readOnlyIndex = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only'; |
|
| 81 | 81 | if (isset($calendar[$readOnlyIndex])) { |
| 82 | 82 | $readOnly = $calendar[$readOnlyIndex]; |
| 83 | 83 | } |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | $calendarTableData[] = [ |
| 86 | 86 | $calendar['uri'], |
| 87 | 87 | $calendar['{DAV:}displayname'], |
| 88 | - $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'], |
|
| 89 | - $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'], |
|
| 88 | + $calendar['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal'], |
|
| 89 | + $calendar['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname'], |
|
| 90 | 90 | $readOnly ? ' x ' : ' ✓ ', |
| 91 | 91 | ]; |
| 92 | 92 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | $this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc'; |
| 93 | 93 | |
| 94 | - $this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) { |
|
| 94 | + $this->server->xml->classMap['DateTime'] = function(Writer $writer, \DateTime $value) { |
|
| 95 | 95 | $writer->write(\Sabre\HTTP\toDate($value)); |
| 96 | 96 | }; |
| 97 | 97 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | // having their own comments marked as unread |
| 126 | 126 | $node->setReadMarker(null); |
| 127 | 127 | |
| 128 | - $url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId()); |
|
| 128 | + $url = rtrim($request->getUrl(), '/').'/'.urlencode($comment->getId()); |
|
| 129 | 129 | |
| 130 | 130 | $response->setHeader('Content-Location', $url); |
| 131 | 131 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $this::REPORT_PARAM_OFFSET, |
| 168 | 168 | $this::REPORT_PARAM_TIMESTAMP |
| 169 | 169 | ]; |
| 170 | - $ns = '{' . $this::NS_OWNCLOUD . '}'; |
|
| 170 | + $ns = '{'.$this::NS_OWNCLOUD.'}'; |
|
| 171 | 171 | foreach ($report as $parameter) { |
| 172 | 172 | if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) { |
| 173 | 173 | continue; |
@@ -183,11 +183,11 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $responses = []; |
| 185 | 185 | foreach ($results as $node) { |
| 186 | - $nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId(); |
|
| 186 | + $nodePath = $this->server->getRequestUri().'/'.$node->comment->getId(); |
|
| 187 | 187 | $resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames()); |
| 188 | 188 | if (isset($resultSet[0]) && isset($resultSet[0][200])) { |
| 189 | 189 | $responses[] = new Response( |
| 190 | - $this->server->getBaseUri() . $nodePath, |
|
| 190 | + $this->server->getBaseUri().$nodePath, |
|
| 191 | 191 | [200 => $resultSet[0][200]], |
| 192 | 192 | 200 |
| 193 | 193 | ); |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | if (is_null($actorId)) { |
| 237 | - throw new BadRequest('Invalid actor "' . $actorType .'"'); |
|
| 237 | + throw new BadRequest('Invalid actor "'.$actorType.'"'); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | try { |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | throw new BadRequest('Invalid input values', 0, $e); |
| 248 | 248 | } catch (\OCP\Comments\MessageTooLongException $e) { |
| 249 | 249 | $msg = 'Message exceeds allowed character limit of '; |
| 250 | - throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
| 250 | + throw new BadRequest($msg.\OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e); |
|
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | return; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - $file = $folder->newFile('photo.' . $extension); |
|
| 124 | + $file = $folder->newFile('photo.'.$extension); |
|
| 125 | 125 | $file->putContent($data['body']); |
| 126 | 126 | } |
| 127 | 127 | |
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | $ext = $this->getExtension($folder); |
| 134 | 134 | |
| 135 | 135 | if ($size === -1) { |
| 136 | - $path = 'photo.' . $ext; |
|
| 136 | + $path = 'photo.'.$ext; |
|
| 137 | 137 | } else { |
| 138 | - $path = 'photo.' . $size . '.' . $ext; |
|
| 138 | + $path = 'photo.'.$size.'.'.$ext; |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | try { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | $photo = new \OC_Image(); |
| 149 | 149 | /** @var ISimpleFile $file */ |
| 150 | - $file = $folder->getFile('photo.' . $ext); |
|
| 150 | + $file = $folder->getFile('photo.'.$ext); |
|
| 151 | 151 | $photo->loadFromData($file->getContent()); |
| 152 | 152 | |
| 153 | 153 | $ratio = $photo->width() / $photo->height(); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | * @throws NotPermittedException |
| 176 | 176 | */ |
| 177 | 177 | private function getFolder(int $addressBookId, string $cardUri, bool $createIfNotExists = true): ISimpleFolder { |
| 178 | - $hash = md5($addressBookId . ' ' . $cardUri); |
|
| 178 | + $hash = md5($addressBookId.' '.$cardUri); |
|
| 179 | 179 | try { |
| 180 | 180 | return $this->appData->getFolder($hash); |
| 181 | 181 | } catch (NotFoundException $e) { |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | private function getExtension(ISimpleFolder $folder): string { |
| 198 | 198 | foreach (self::ALLOWED_CONTENT_TYPES as $extension) { |
| 199 | - if ($folder->fileExists('photo.' . $extension)) { |
|
| 199 | + if ($folder->fileExists('photo.'.$extension)) { |
|
| 200 | 200 | return $extension; |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | if (strpos($type, 'image/') === 0) { |
| 270 | 270 | return $type; |
| 271 | 271 | } else { |
| 272 | - return 'image/' . strtolower($type); |
|
| 272 | + return 'image/'.strtolower($type); |
|
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | 275 | return ''; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $results = $folder->search($query); |
| 161 | 161 | |
| 162 | 162 | /** @var SearchResult[] $nodes */ |
| 163 | - $nodes = array_map(function (Node $node) { |
|
| 163 | + $nodes = array_map(function(Node $node) { |
|
| 164 | 164 | if ($node instanceof Folder) { |
| 165 | 165 | $davNode = new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager); |
| 166 | 166 | } else { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | if (!$query->limitToHome()) { |
| 175 | 175 | // Sort again, since the result from multiple storages is appended and not sorted |
| 176 | - usort($nodes, function (SearchResult $a, SearchResult $b) use ($search) { |
|
| 176 | + usort($nodes, function(SearchResult $a, SearchResult $b) use ($search) { |
|
| 177 | 177 | return $this->sort($a, $b, $search->orderBy); |
| 178 | 178 | }); |
| 179 | 179 | } |
@@ -263,8 +263,8 @@ discard block |
||
| 263 | 263 | * @return string |
| 264 | 264 | */ |
| 265 | 265 | private function getHrefForNode(Node $node) { |
| 266 | - $base = '/files/' . $this->user->getUID(); |
|
| 267 | - return $base . $this->view->getRelativePath($node->getPath()); |
|
| 266 | + $base = '/files/'.$this->user->getUID(); |
|
| 267 | + return $base.$this->view->getRelativePath($node->getPath()); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | /** |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | |
| 291 | 291 | return new SearchQuery( |
| 292 | 292 | $this->transformSearchOperation($query->where), |
| 293 | - (int)$limit->maxResults, |
|
| 293 | + (int) $limit->maxResults, |
|
| 294 | 294 | $offset, |
| 295 | 295 | $orders, |
| 296 | 296 | $this->user, |
@@ -325,19 +325,19 @@ discard block |
||
| 325 | 325 | case Operator::OPERATION_LESS_THAN: |
| 326 | 326 | case Operator::OPERATION_IS_LIKE: |
| 327 | 327 | if (count($operator->arguments) !== 2) { |
| 328 | - throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation'); |
|
| 328 | + throw new \InvalidArgumentException('Invalid number of arguments for '.$trimmedType.' operation'); |
|
| 329 | 329 | } |
| 330 | 330 | if (!($operator->arguments[0] instanceof SearchPropertyDefinition)) { |
| 331 | - throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property'); |
|
| 331 | + throw new \InvalidArgumentException('Invalid argument 1 for '.$trimmedType.' operation, expected property'); |
|
| 332 | 332 | } |
| 333 | 333 | if (!($operator->arguments[1] instanceof Literal)) { |
| 334 | - throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal'); |
|
| 334 | + throw new \InvalidArgumentException('Invalid argument 2 for '.$trimmedType.' operation, expected literal'); |
|
| 335 | 335 | } |
| 336 | 336 | return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value)); |
| 337 | 337 | case Operator::OPERATION_IS_COLLECTION: |
| 338 | 338 | return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE); |
| 339 | 339 | default: |
| 340 | - throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')'); |
|
| 340 | + throw new \InvalidArgumentException('Unsupported operation '.$trimmedType.' ('.$operator->type.')'); |
|
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME: |
| 363 | 363 | return 'fileid'; |
| 364 | 364 | default: |
| 365 | - throw new \InvalidArgumentException('Unsupported property for search or order: ' . $property->name); |
|
| 365 | + throw new \InvalidArgumentException('Unsupported property for search or order: '.$property->name); |
|
| 366 | 366 | } |
| 367 | 367 | } |
| 368 | 368 | |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | |
| 100 | 100 | $templateName = 'exception'; |
| 101 | 101 | if ($httpCode === 403 || $httpCode === 404) { |
| 102 | - $templateName = (string)$httpCode; |
|
| 102 | + $templateName = (string) $httpCode; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | $content = new OC_Template('core', $templateName, 'guest'); |